aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java1
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java9
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 5360331040..2867b392d2 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -60,6 +60,7 @@ public class COMPAT_HANDLER {
GregtechSolarGenerators.run();
GregtechPowerSubStation.run();
GregtechDehydrator.run();
+ GregtechAdvancedBoilers.run();
GregtechTieredFluidTanks.run();
GregtechIndustrialMultiTank.run();
GregtechGeothermalThermalGenerator.run();
diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index 6c80dc4a1d..6f52da7fb0 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -344,7 +344,7 @@ public class RecipeUtils {
}
}
- public static boolean addShapedGregtechRecipe(final Object[] inputs, final ItemStack output){
+ public static boolean addShapedGregtechRecipe(final Object[] inputs, ItemStack output){
if (inputs.length != 9){
Utils.LOG_INFO("Input array for "+output.getDisplayName()+" does not equal 9.");
@@ -356,7 +356,14 @@ public class RecipeUtils {
inputs[x] = " ";
}
if (!(inputs[x] instanceof ItemStack) || !(inputs[x] instanceof String)){
+ if (output != null){
Utils.LOG_INFO("Invalid Item inserted into inputArray. Item:"+output.getDisplayName()+" has a bad recipe. Please report to Alkalus.");
+ return false;
+ }
+ else {
+ Utils.LOG_INFO("Output is Null for a recipe. Report to Alkalus.");
+ output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
+ }
}
}