From f693ee75e0533a25ebd3473cc19b0521a742625a Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Mon, 25 Nov 2013 19:40:43 -0500 Subject: [PATCH] update to 1.5.1 RC2 c2cdb7 --- src/main/java/tconstruct/TConstruct.java | 2 +- .../java/tconstruct/client/TProxyClient.java | 1 + .../client/gui/StencilTableGui.java | 8 ++--- src/main/java/tconstruct/common/TContent.java | 33 ++++++++++++------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 65870319..4905cf40 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -32,7 +32,7 @@ import tconstruct.worldgen.village.*; * @author mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1d", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_2.0a", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 30d25533..6fac0127 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -452,6 +452,7 @@ public class TProxyClient extends TProxyCommon ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4); // TConstruct recipes + TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null); TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null); diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 3c58a2ae..63bc1dd6 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -93,17 +93,17 @@ public class StencilTableGui extends GuiContainer if (button.id == 0) { patternIndex++; - if (patternIndex == 21 || patternIndex == 26) + if (patternIndex == 21) patternIndex++; - if (patternIndex >= TContent.patternOutputs.length) + if (patternIndex >= TContent.patternOutputs.length - 1) patternIndex = 0; } else if (button.id == 1) { patternIndex--; if (patternIndex < 0) - patternIndex = TContent.patternOutputs.length - 1; - if (patternIndex == 21 || patternIndex == 26) + patternIndex = TContent.patternOutputs.length - 2; + if (patternIndex == 21) patternIndex--; } ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 8ded83c0..828f2c5a 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1170,7 +1170,7 @@ public class TContent implements IFuelHandler String[] patSurround = { "###", "#m#", "###" }; Object[] toolForgeBlocks = { "blockIron", "blockGold", Block.blockDiamond, Block.blockEmerald, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", - "blockNaturalAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; + "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; // ToolForge Recipes (Metal Version) for (int sc = 0; sc < toolForgeBlocks.length; sc++) @@ -1251,7 +1251,8 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 2), patBlock, '#', new ItemStack(materials, 1, 5)); // Manyullyn GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel - + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 11), patBlock, '#', new ItemStack(materials, 1, 12)); //Aluminum raw -> ingot + GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum @@ -1345,6 +1346,8 @@ public class TContent implements IFuelHandler // Gold Pressure Plate - Vanilla alternativ GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); //Accessories + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum")); GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed)); GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), new ItemStack(materials, 1, 8), new ItemStack(heartCanister, 1, 0), new ItemStack( @@ -1438,7 +1441,7 @@ public class TContent implements IFuelHandler //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f); + FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 11), 0.5f); FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f); FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); @@ -1762,7 +1765,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 800); + Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 640); //Blocks melt as themselves! //Ore @@ -1966,24 +1969,27 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2)); OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); - OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreSlag, 1, 5)); + OreDictionary.registerOre("oreAluminum", new ItemStack(oreSlag, 1, 5)); + OreDictionary.registerOre("oreAluminium", new ItemStack(oreSlag, 1, 5)); OreDictionary.registerOre("oreIron", new ItemStack(oreGravel, 1, 0)); OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1)); OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5)); OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2)); OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3)); - OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreGravel, 1, 4)); + OreDictionary.registerOre("oreAluminum", new ItemStack(oreGravel, 1, 4)); + OreDictionary.registerOre("oreAluminium", new ItemStack(oreGravel, 1, 4)); OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3)); OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9)); OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10)); - OreDictionary.registerOre("ingotNaturalAluminum", new ItemStack(materials, 1, 11)); - OreDictionary.registerOre("naturalAluminum", new ItemStack(materials, 1, 12)); + OreDictionary.registerOre("ingotAluminum", new ItemStack(materials, 1, 11)); + OreDictionary.registerOre("ingotAluminium", new ItemStack(materials, 1, 11)); OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13)); OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14)); + OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(materials, 1, 14)); OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15)); OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16)); ensureOreIsRegistered("ingotIron", new ItemStack(Item.ingotIron)); @@ -1998,8 +2004,10 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3)); OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4)); OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5)); - OreDictionary.registerOre("blockNaturalAluminum", new ItemStack(metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminum", new ItemStack(metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminium", new ItemStack(metalBlock, 1, 6)); OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); + OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(metalBlock, 1, 7)); OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); ensureOreIsRegistered("blockIron", new ItemStack(Block.blockIron)); @@ -2011,9 +2019,12 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("nuggetCopper", new ItemStack(oreBerries, 1, 2)); OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21)); OreDictionary.registerOre("nuggetTin", new ItemStack(oreBerries, 1, 3)); - OreDictionary.registerOre("nuggetNaturalAluminum", new ItemStack(materials, 1, 22)); - OreDictionary.registerOre("nuggetNaturalAluminum", new ItemStack(oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(oreBerries, 1, 4)); OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24)); + OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(materials, 1, 24)); OreDictionary.registerOre("nuggetObsidian", new ItemStack(materials, 1, 27)); OreDictionary.registerOre("nuggetCobalt", new ItemStack(materials, 1, 28)); OreDictionary.registerOre("nuggetArdite", new ItemStack(materials, 1, 29));