aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util/materials
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-23 21:53:04 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-23 21:53:04 +1000
commitae8a4b14a0de47c081d518681647d14122163f8e (patch)
treecfad69fc4475cf6560fcfbe9454184d463c407ff /src/Java/gtPlusPlus/core/util/materials
parent757d747a2f7a63bec084a48303250af2956876ef (diff)
downloadGT5-Unofficial-ae8a4b14a0de47c081d518681647d14122163f8e.tar.gz
GT5-Unofficial-ae8a4b14a0de47c081d518681647d14122163f8e.tar.bz2
GT5-Unofficial-ae8a4b14a0de47c081d518681647d14122163f8e.zip
$ Heavily improved the code for item replacements in CoreItem.java.
+ Added handlers in Material.java for materials with invalid names. % Changed logging on some math related functions in Utils.java. + Added an extra case for Infused dusts into MaterialUtils.java.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/materials')
-rw-r--r--src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index d72af46c8a..d96d813e6f 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -55,8 +55,8 @@ public class MaterialUtils {
int radioactivity = 0;
if (material.isRadioactive()){
radioactivity = 1;
- }
- if (hasValidRGBA(rgba) || element == Element.H){
+ }
+ 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);