Slapfix for AE2 compatibility

SlimeKnights · Aug 2, 2014 · ac6b5e2 · ac6b5e2
1 parent 180ffe2
commit ac6b5e2
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -366,9 +366,20 @@ public void preInit (FMLPreInitializationEvent event)
                 TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod,
                 TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead,
                 TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null };
-    }
+
+//Moved temporarily to deal with AE2 Quartz
+        TinkerTools.modFlux = new ModFlux();
+        ModifyBuilder.registerModifier(TinkerTools.modFlux);
 
-
+        ItemStack lapisItem = new ItemStack(Items.dye, 1, 4);
+        ItemStack lapisBlock = new ItemStack(Blocks.lapis_block);
+        TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 });
+        ModifyBuilder.registerModifier(TinkerTools.modLapis);
+
+        TinkerTools.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz),
+                new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 });
+        ModifyBuilder.registerModifier(TinkerTools.modAttack);
+    }    
 
     void setupToolTabs ()
     {
@@ -482,18 +493,10 @@ private void addRecipesForToolBuilder ()
         ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72"
                 + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72"));
 
-        TinkerTools.modFlux = new ModFlux();
-        ModifyBuilder.registerModifier(TinkerTools.modFlux);
-
         ItemStack redstoneItem = new ItemStack(Items.redstone);
         ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block);
         ModifyBuilder.registerModifier(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }));
 
-        ItemStack lapisItem = new ItemStack(Items.dye, 1, 4);
-        ItemStack lapisBlock = new ItemStack(Blocks.lapis_block);
-        TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 });
-        ModifyBuilder.registerModifier(TinkerTools.modLapis);
-
         ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", StatCollector
                 .translateToLocal("modifier.tool.moss")));
         ItemStack blazePowder = new ItemStack(Items.blaze_powder);
@@ -503,10 +506,6 @@ private void addRecipesForToolBuilder ()
         ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", StatCollector
                 .translateToLocal("modifier.tool.necro")));
 
-        TinkerTools.modAttack = new ModAttack(StatCollector.translateToLocal("gui.modifier.quartz"), 11, new ItemStack[] { new ItemStack(Items.quartz),
-                new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 });
-        ModifyBuilder.registerModifier(TinkerTools.modAttack);
-
         ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free"));
         ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free"));
         ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free"));
@@ -519,13 +518,13 @@ private void addRecipesForToolBuilder ()
         ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 }));
 
         ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1,
-                "\u00a7d", StatCollector.translateToLocal("modifier.tool.beheading")));
+                "\u00a7d", "Beheading"));
 
         ItemStack holySoil = new ItemStack(TinkerTools.craftedSoil, 1, 4);
-        ModifyBuilder.registerModifier(new ModSmite(StatCollector.translateToLocal("modifier.tool.smite"), 14, new ItemStack[] { holySoil }, new int[] { 1 }));
+        ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 }));
 
         ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye);
-        ModifyBuilder.registerModifier(new ModAntiSpider(StatCollector.translateToLocal("gui.modifier.spider"), 15, new ItemStack[] { spidereyeball }, new int[] { 1 }));
+        ModifyBuilder.registerModifier(new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 }));
 
         ItemStack obsidianPlate = new ItemStack(TinkerTools.largePlate, 1, 6);
         ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1));