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/util/materials/MaterialUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/util/materials') diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 5d219f72b0..0d01e83848 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -50,6 +50,7 @@ public class MaterialUtils { long protons = material.getProtons(); long neutrons = material.getNeutrons(); boolean blastFurnace = material.mBlastFurnaceRequired; + int durability = material.mDurability; String chemicalFormula = MaterialUtils.subscript(material.mChemicalFormula); Element element = material.mElement; int radioactivity = 0; @@ -63,7 +64,7 @@ public class MaterialUtils { if (hasValidRGBA(rgba) || element == Element.H || (material == Materials.InfusedAir || material == Materials.InfusedFire || material == Materials.InfusedEarth || material == Materials.InfusedWater)){ //ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material); //ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material); - return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity); + return new Material(name, durability, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity); } return null; @@ -72,6 +73,7 @@ public class MaterialUtils { public static Material generateQuickMaterial(String materialName, short[] colour, int sRadioactivity) { Material temp = new Material( materialName, + 0, //Durability colour, 1000, //melting 3000, //boiling -- cgit