Change Tool Material naming to be unique

Author: KAMKEEL

build.gradle

@@ -23,7 +23,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "5.1"
+version = "5.2"
 group= "com.kamkeel.plugin" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "PluginMod"
 

src/main/java/kamkeel/plugin/Items/ModItems.java

@@ -198,20 +198,18 @@ public static void init() {
 
         if(ConfigItems.SpecialWeaponItems && !ConfigItems.DisableAllWeapons){
             // Ingot Assignment
-            dark_metal.customCraftingMaterial = dark_metal_ingot;
-            custom_dark_metal.customCraftingMaterial = dark_metal_ingot;
-            glass.customCraftingMaterial = glass_shard;
-            custom_glass.customCraftingMaterial = glass_shard;
-            random.customCraftingMaterial = glass_shard;
-            jungle.customCraftingMaterial = jungle_ingot;
-            custom_jungle.customCraftingMaterial = jungle_ingot;
-            blue_steel.customCraftingMaterial = blue_steel_ingot;
-            custom_blue_steel.customCraftingMaterial = blue_steel_ingot;
-            imperial_gold.customCraftingMaterial = imperial_gold_ingot;
-            custom_imperial_gold.customCraftingMaterial = imperial_gold_ingot;
-            PluginMaterial.customCraftingMaterial = plug_ingot;
-
-            OreDictCompact.registerOres();
+            dark_metal.setRepairItem(new ItemStack(dark_metal_ingot));
+            custom_dark_metal.setRepairItem(new ItemStack(dark_metal_ingot));
+            glass.setRepairItem(new ItemStack(glass_shard));
+            custom_glass.setRepairItem(new ItemStack(glass_shard));
+            random.setRepairItem(new ItemStack(glass_shard));
+            jungle.setRepairItem(new ItemStack(jungle_ingot));
+            custom_jungle.setRepairItem(new ItemStack(jungle_ingot));
+            blue_steel.setRepairItem(new ItemStack(blue_steel_ingot));
+            custom_blue_steel.setRepairItem(new ItemStack(blue_steel_ingot));
+            imperial_gold.setRepairItem(new ItemStack(imperial_gold_ingot));
+            custom_imperial_gold.setRepairItem(new ItemStack(imperial_gold_ingot));
+            PluginMaterial.setRepairItem(new ItemStack(plug_ingot));
         }
     }
 

src/main/java/kamkeel/plugin/PluginMod.java

@@ -27,7 +27,7 @@
 
 import java.io.File;
 
-@Mod(modid = "plug", name = "The Plugin Mod", version = "5.1")
+@Mod(modid = "plug", name = "The Plugin Mod", version = "5.2")
 public class PluginMod {
 
     @SidedProxy(clientSide = "kamkeel.plugin.Client.ClientProxy", serverSide = "kamkeel.plugin.CommonProxy")

src/main/java/kamkeel/plugin/Util/PluginMaterials.java

@@ -15,11 +15,11 @@ public class PluginMaterials {
     public static Item.ToolMaterial jungle = EnumHelper.addToolMaterial("JUNGLE", EnumToolMaterials.JUNGLE.getHarvestLevel(), EnumToolMaterials.JUNGLE.getMaxUses(), EnumToolMaterials.JUNGLE.getEfficiencyOnProperMaterial(), EnumToolMaterials.JUNGLE.getDamageVsEntity(), EnumToolMaterials.JUNGLE.getEnchantability());
     public static Item.ToolMaterial glass = EnumHelper.addToolMaterial("GLASS", EnumToolMaterials.GLASS.getHarvestLevel(), EnumToolMaterials.GLASS.getMaxUses(), EnumToolMaterials.GLASS.getEfficiencyOnProperMaterial(), EnumToolMaterials.GLASS.getDamageVsEntity(), EnumToolMaterials.GLASS.getEnchantability());
 
-    public static Item.ToolMaterial custom_dark_metal = EnumHelper.addToolMaterial("DARK_METAL", EnumToolMaterials.DARK_METAL.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.DARK_METAL.getEfficiencyOnProperMaterial(), 7, 0);
-    public static Item.ToolMaterial custom_blue_steel = EnumHelper.addToolMaterial("BLUE_STEEL", EnumToolMaterials.BLUE_STEEL.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.BLUE_STEEL.getEfficiencyOnProperMaterial(), 7, 0);
-    public static Item.ToolMaterial custom_jungle = EnumHelper.addToolMaterial("JUNGLE", EnumToolMaterials.JUNGLE.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.JUNGLE.getEfficiencyOnProperMaterial(), 7, 0);
-    public static Item.ToolMaterial custom_glass = EnumHelper.addToolMaterial("GLASS", EnumToolMaterials.GLASS.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.GLASS.getEfficiencyOnProperMaterial(), 7, 0);
-    public static Item.ToolMaterial custom_imperial_gold = EnumHelper.addToolMaterial("IMPERIAL_GOLD", EnumToolMaterials.IMPERIAL_GOLD.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.IMPERIAL_GOLD.getEfficiencyOnProperMaterial(), 7, 0);
+    public static Item.ToolMaterial custom_dark_metal = EnumHelper.addToolMaterial("UNIQUE_DARK_METAL", EnumToolMaterials.DARK_METAL.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.DARK_METAL.getEfficiencyOnProperMaterial(), 7, 0);
+    public static Item.ToolMaterial custom_blue_steel = EnumHelper.addToolMaterial("UNIQUE_BLUE_STEEL", EnumToolMaterials.BLUE_STEEL.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.BLUE_STEEL.getEfficiencyOnProperMaterial(), 7, 0);
+    public static Item.ToolMaterial custom_jungle = EnumHelper.addToolMaterial("UNIQUE_JUNGLE", EnumToolMaterials.JUNGLE.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.JUNGLE.getEfficiencyOnProperMaterial(), 7, 0);
+    public static Item.ToolMaterial custom_glass = EnumHelper.addToolMaterial("UNIQUE_GLASS", EnumToolMaterials.GLASS.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.GLASS.getEfficiencyOnProperMaterial(), 7, 0);
+    public static Item.ToolMaterial custom_imperial_gold = EnumHelper.addToolMaterial("UNIQUE_IMPERIAL_GOLD", EnumToolMaterials.IMPERIAL_GOLD.getHarvestLevel(), EnumToolMaterials.UNIQUEMATERIAL.getMaxUses(), EnumToolMaterials.IMPERIAL_GOLD.getEfficiencyOnProperMaterial(), 7, 0);
     public static Item.ToolMaterial random = EnumHelper.addToolMaterial("RANDOM", EnumToolMaterials.GLASS.getHarvestLevel(), 5, EnumToolMaterials.GLASS.getEfficiencyOnProperMaterial(), 7, 0);
 
     public static Item.ToolMaterial brokenTool = EnumHelper.addToolMaterial("BROKEN", Item.ToolMaterial.IRON.getHarvestLevel(), 0, Item.ToolMaterial.IRON.getEfficiencyOnProperMaterial(), 1, 0);