From 15218cccd32599e0677d433e3765f5fa96045f78 Mon Sep 17 00:00:00 2001 From: "MoreThanHidden (John816)" Date: Tue, 8 Dec 2015 19:15:13 +0800 Subject: [PATCH] fix #281, addRepairMaterial Removed un-needed reference to non-static ItemKey Constructor, fix #281 --- .../modtweaker2/mods/tconstruct/TConstructHelper.java | 11 ----------- .../mods/tconstruct/handlers/TiCTweaks.java | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java index 3362ed4..8bc028c 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java +++ b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java @@ -67,15 +67,4 @@ public class TConstructHelper { output); } - public static String getMaterialFromID(int id) { - return TConstructRegistry.toolMaterials.get(id).materialName; - } - - public static ItemKey getItemKey(Item item, int damage, int value, String material) { - return ReflectionHelper.getInstance(ReflectionHelper.getConstructor(ItemKey.class, ItemStack.class, int.class, int.class, String.class), - item, - damage, - value, - material); - } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java index f13030c..4cd4eff 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java @@ -66,7 +66,7 @@ public class TiCTweaks { @ZenMethod public static void addRepairMaterial(IItemStack stack, String material, int value) { ItemStack input = toStack(stack); - MineTweakerAPI.apply(new Add(TConstructHelper.getItemKey(input.getItem(), input.getItemDamage(), value, material))); + MineTweakerAPI.apply(new Add(PatternBuilder.instance.new ItemKey(input.getItem(), input.getItemDamage(), value, material))); } // Tweaks for setting repair materials