aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-23 20:32:22 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-23 20:32:22 +1000
commit4e22125d6ddc878853cc3cadcec272a1a92e5135 (patch)
treebfab2239a40f54937ab7443e4f8ed896b37516da /src/Java/gtPlusPlus/core/util
parent6754387bca14ef3c2bdc5e69d0f4920ca7568553 (diff)
downloadGT5-Unofficial-4e22125d6ddc878853cc3cadcec272a1a92e5135.tar.gz
GT5-Unofficial-4e22125d6ddc878853cc3cadcec272a1a92e5135.tar.bz2
GT5-Unofficial-4e22125d6ddc878853cc3cadcec272a1a92e5135.zip
- Disabled generation of Deci/Centi dusts for now.
+ Added a check for Growthcraft versioning, newer versions past 2.3.1 will not have extra support loaded. + Improved Chemical Compound tooltip generation on dusts.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index 61171e3688..52e925df0e 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -60,6 +60,8 @@ public class MaterialUtils {
radioactivity = 1;
}
if (hasValidRGBA(rgba)){
+ //ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material);
+ //ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material);
return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, null, chemicalFormula, radioactivity);
}
return null;
diff --git a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
index 624bde2ead..ee582c0646 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
@@ -23,7 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class UtilsRecipe {
- public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){
+ public static boolean recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){
ArrayList<Object> validSlots = new ArrayList<Object>();
@@ -108,6 +108,7 @@ public class UtilsRecipe {
else {
LateRegistrationHandler.recipesSuccess++;
}
+ return true;
}
catch(NullPointerException | ClassCastException k){
k.getMessage();
@@ -120,7 +121,8 @@ public class UtilsRecipe {
}
else {
LateRegistrationHandler.recipesFailed++;
- }
+ }
+ return false;
}
}