aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-06-10 09:41:00 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-06-10 09:41:00 +1000
commitfd522373d72560e66c4d40a69664ba424dbd30cc (patch)
tree37345ecc4842fc8734b7edac68590d619b5060fd /src/Java/gtPlusPlus/core
parent8cf1ffb4c853ff323ffbd52951dd17391573a08e (diff)
downloadGT5-Unofficial-fd522373d72560e66c4d40a69664ba424dbd30cc.tar.gz
GT5-Unofficial-fd522373d72560e66c4d40a69664ba424dbd30cc.tar.bz2
GT5-Unofficial-fd522373d72560e66c4d40a69664ba424dbd30cc.zip
$ Fixed failed recipe count.
$ Fixed an issue where LOTS of things wouldn't load their recipes. - Removed two old unused shapeless recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java1
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java14
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java20
3 files changed, 17 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 8f1d84fdb6..71eb505e21 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -283,7 +283,6 @@ public class RECIPES_Machines {
IC2MFSU = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
}
if (LoadedMods.Gregtech){
- RECIPES_Shapeless.dustStaballoy = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
machineCasing_ULV = ItemList.Casing_ULV.get(1);
machineCasing_LV = ItemList.Casing_LV.get(1);
machineCasing_MV = ItemList.Casing_MV.get(1);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index 640a524a21..c1f88d91d0 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.recipe;
-import gregtech.api.enums.ItemList;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
public class RECIPES_Shapeless {
@@ -29,17 +27,7 @@ public class RECIPES_Shapeless {
private static void run(){
//Gregtech items
if (LoadedMods.Gregtech){
- gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
-
- RecipeUtils.shapelessBuilder(dustStaballoy,
- "dustTitanium", "dustUranium", "dustUranium",
- "dustUranium", "dustUranium", "dustUranium",
- "dustUranium", "dustUranium", "dustUranium");
-
- RecipeUtils.shapelessBuilder(gearboxCasing_Tier_1,
- circuitPrimitive, circuitPrimitive, circuitPrimitive,
- circuitPrimitive, circuitPrimitive, circuitPrimitive,
- circuitPrimitive, circuitPrimitive, circuitPrimitive);
+
}
}
diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index fc73c4f325..ca7d1cf6ea 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -32,6 +32,7 @@ public class RecipeUtils {
(slot_7 == null) && (slot_8 == null) && (slot_9 == null)){
Utils.LOG_INFO("Found a recipe with 0 inputs, yet had a valid output.");
Utils.LOG_INFO("Error found while adding a recipe for: "+resultItem.getDisplayName()+" | Please report this issue on Github.");
+ RegistrationHandler.recipesFailed++;
return false;
}
@@ -339,7 +340,11 @@ public class RecipeUtils {
if (addShapedGregtechRecipe(o, OutputItem)){
return true;
}
- else {
+ else {
+ if (OutputItem != null){
+ Utils.LOG_INFO("Adding recipe for "+OutputItem.getDisplayName()+" failed. Error 62.");
+ }
+ RegistrationHandler.recipesFailed++;
return false;
}
}
@@ -347,17 +352,22 @@ public class RecipeUtils {
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.");
+ Utils.LOG_INFO("Input array for "+output.getDisplayName()+" does not equal 9. "+inputs.length+" is the actual size.");
+
+ RegistrationHandler.recipesFailed++;
return false;
}
for (int x=0;x<9;x++){
if (inputs[x] == null){
inputs[x] = " ";
+ Utils.LOG_INFO("Input slot "+x+" changed from NULL to a blank space.");
}
- if (!(inputs[x] instanceof ItemStack) || !(inputs[x] instanceof String)){
+ else 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.");
+
+ RegistrationHandler.recipesFailed++;
return false;
}
else {
@@ -385,7 +395,9 @@ public class RecipeUtils {
return true;
}
else {
- Utils.LOG_INFO("Failed to add recipe for "+output.getDisplayName()+". Please report to Alkalus.");
+ if (output != null){
+ Utils.LOG_INFO("Adding recipe for "+output.getDisplayName()+" failed. Error 61.");
+ }
return false;
}
}