diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-18 13:22:13 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-18 13:22:13 +1000 |
| commit | b9fe3352840abe0846834cefd578895ec6f5e520 (patch) | |
| tree | 416885a2c65de3ee61b6bccc4f128f197c92464a /src/Java/gtPlusPlus/core/util | |
| parent | 86dac7e948cff5c9b975ff86fef149377285eab8 (diff) | |
| download | GT5-Unofficial-b9fe3352840abe0846834cefd578895ec6f5e520.tar.gz GT5-Unofficial-b9fe3352840abe0846834cefd578895ec6f5e520.tar.bz2 GT5-Unofficial-b9fe3352840abe0846834cefd578895ec6f5e520.zip | |
+ Added Trinium and Trinium related Alloys.
+ Added more recycling recipes.
$ Fixed bad materials in component assembler recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java | 2 |
2 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 3e79d46c19..66c991ce99 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -82,7 +82,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, materialState, durability, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity); + return new Material(name, materialState, durability, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity, false); } return null; diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index f88f8e32e0..5f7a60f546 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -95,7 +95,7 @@ public class ReflectionUtils { public static String getMethodName(final int depth) { final StackTraceElement[] ste = new Throwable().getStackTrace(); //System. out.println(ste[ste.length-depth].getClassName()+"#"+ste[ste.length-depth].getMethodName()); - return ste[depth].getMethodName(); + return ste[depth+1].getMethodName(); } |