aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util/materials
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-01-14 15:42:43 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-01-14 15:42:43 +1000
commit881eece559ff4eb2646973de1717d795c16c543b (patch)
tree4cce79b3d1bc8ee6dc65f49741cb7663db64e945 /src/Java/gtPlusPlus/core/util/materials
parentc8612eb547b97653489e23108a1cbb6fb3a21f3c (diff)
downloadGT5-Unofficial-881eece559ff4eb2646973de1717d795c16c543b.tar.gz
GT5-Unofficial-881eece559ff4eb2646973de1717d795c16c543b.tar.bz2
GT5-Unofficial-881eece559ff4eb2646973de1717d795c16c543b.zip
$ Re-wrote the handling of Multitool generation, to allow my own materials to have tools.
% Bumped Multispade durability by 3x.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/materials')
-rw-r--r--src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java4
1 files changed, 3 insertions, 1 deletions
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