diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg new file mode 100644 index 00000000000..746d3e461b8 --- /dev/null +++ b/resources/TConstruct_at.cfg @@ -0,0 +1,26 @@ +# Tinkers Construct -- Access Transformer +# Required for Ant build system. +# Last update: Minecraft 1.6.4 - 2013 Sept 20 +# EntityArrow - Grabbed 'em all, since so much is accessed +public uh.a +public uh.au +public uh.av +public uh.aw +public uh.b +public uh.c +public uh.d +public uh.e +public uh.f +public uh.g +public uh.h +public uh.i +public uh.j +# GuiContainer +public awy.p #guiLeft +public awy.q #guiTop +# GuiScreen +public awe.i #buttonList +# ThreadDownloadImageData +public bic.g #field_110559_g +public bic.d #field_110560_d +# needs to have a space at the end of every line or SS will derp \ No newline at end of file diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index 7edf11b6d1d..8717d313a3d 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -1024,43 +1024,6 @@ Effects: - Uses energy instead of durability while charged - Available from Thermal Expansion 3 -Type: Single-use -Stackable: No -Note: this modifier will be removed in Minecraft 1.7 - - - -tool -fluxmod2 - - - -Flux -Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. - -Effects: -- Allows the tool to be charged with Redstone Flux -- Uses energy instead of durability while charged -- Available from Thermal Expansion 3 - -Type: Single-use -Stackable: No - - - -tool -fluxmod - - - -Flux -Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. - -Effects: -- Allows the tool to be charged with Redstone Flux -- Uses energy instead of durability while charged -- Available from Thermal Expansion 3 - Type: Single-use Stackable: No diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 827e953fa11..d07fe37446e 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -337,7 +337,7 @@ public void initManualIcons () TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4)); TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9)); TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16)); - TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); + TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); // Tool parts @@ -370,7 +370,7 @@ public void initManualIcons () TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0)); TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2)); TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0)); - + TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16)); TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15)); TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25)); @@ -420,7 +420,7 @@ public void initManualRecipes () ItemStack stick = new ItemStack(Item.stick, 1, 0); ItemStack plank = new ItemStack(Block.planks, 1, 0); - ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); + ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); ItemStack workbench = new ItemStack(Block.workbench, 1, 0); ItemStack chest = new ItemStack(Block.chest, 1, 0); ItemStack log = new ItemStack(Block.wood, 1, 0); @@ -452,7 +452,7 @@ public void initManualRecipes () 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.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/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index fb03ea7d314..d45bf8f7531 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1347,7 +1347,7 @@ private void addRecipesForCraftingTable () // 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), "##", "##", '#', "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)); @@ -1405,8 +1405,7 @@ private void addRecipesForCraftingTable () GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); //Slab crafters GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); diff --git a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java index 7c57f48e949..1584ce7b25c 100644 --- a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java +++ b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java @@ -25,7 +25,7 @@ public class TConstructLoaderContainer extends DummyModContainer implements IFMLLoadingPlugin { - private final String[] asmTransformers = new String[] { "tconstruct.preloader.AccessTransformers", "tconstruct.preloader.ASMInterfaceRepair" }; + private final String[] asmTransformers = new String[] { "tconstruct.preloader.ASMInterfaceRepair" }; private final ModMetadata md = new ModMetadata(); public static Logger logger = Logger.getLogger("TCon-Preloader");