From 881eece559ff4eb2646973de1717d795c16c543b Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 14 Jan 2017 15:42:43 +1000 Subject: $ Re-wrote the handling of Multitool generation, to allow my own materials to have tools. % Bumped Multispade durability by 3x. --- src/Java/gtPlusPlus/core/item/ModItems.java | 17 ++++------------- .../core/item/tool/staballoy/MultiSpadeBase.java | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 3335a8d89f..adb3c12421 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -16,6 +16,7 @@ import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.item.init.ItemsFoods; +import gtPlusPlus.core.item.init.ItemsMultiTools; import gtPlusPlus.core.item.tool.misc.SandstoneHammer; import gtPlusPlus.core.item.tool.staballoy.*; import gtPlusPlus.core.lib.*; @@ -471,20 +472,10 @@ public final class ModItems { metaItem2.registerItem(4, "Whirlygig", 1043644000, (short) 5, "Spin me right round.", EnumRarity.rare, EnumChatFormatting.DARK_GREEN, true); metaItem2.registerItem(5, "Whirlygig 2", 2124867000, (short) 7, "Spin me right round.", EnumRarity.uncommon, EnumChatFormatting.RED, true); + //Create Multi-tools + ItemsMultiTools.load(); - - //Load Multitools - boolean gtStyleTools = LoadedMods.Gregtech; - if (CORE.configSwitches.enableMultiSizeTools){ - Materials[] rm = Materials.values(); - for (Materials m : rm){ - MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m); - MS_GTMATERIAL = ItemUtils.generateMultiShovel(gtStyleTools, m); - /*itemBaseDecidust = UtilsItems.generateDecidust(m); - itemBaseCentidust = UtilsItems.generateCentidust(m);*/ - } - } - + //Just an unusual plate needed for some black magic. itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); //EnderIO Resources diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 511c6074ea..659086fe92 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -42,7 +42,7 @@ public class MultiSpadeBase extends StaballoySpade{ this.setTextureName("minecraft"+":"+"iron_shovel"); this.FACING_HORIZONTAL=true; this.setMaxStackSize(1); - this.setMaxDamage(materialDurability); + this.setMaxDamage(materialDurability*3); this.colour = colour; this.materialName = material.name(); this.setCreativeTab(AddToCreativeTab.tabTools); -- cgit