diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/MaterialGenerator.java | 21 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java | 9 | ||||
| -rw-r--r-- | src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png (renamed from src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png.png) | bin | 1284 -> 1284 bytes |
3 files changed, 18 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index 693a54e5b6..9e0506dabb 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -88,7 +88,6 @@ public class MaterialGenerator { Item temp; Block tempBlock; tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour); - tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.FRAME, Colour); temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation); temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation); temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation); @@ -96,19 +95,17 @@ public class MaterialGenerator { temp = new BaseItemNugget(matInfo); temp = new BaseItemPlate(matInfo); temp = new BaseItemPlateDouble(matInfo); - - } - //Add A jillion Recipes - old code - RecipeGen_Plates.generateRecipes(matInfo); - RecipeGen_Extruder.generateRecipes(matInfo); - RecipeGen_ShapedCrafting.generateRecipes(matInfo); - RecipeGen_DustGeneration.generateRecipes(matInfo); - if (matInfo != ALLOY.ENERGYCRYSTAL && matInfo != ALLOY.BLOODSTEEL) - RecipeGen_BlastSmelter.generateARecipe(matInfo); - - } + //Add A jillion Recipes - old code + RecipeGen_Plates.generateRecipes(matInfo); + RecipeGen_Extruder.generateRecipes(matInfo); + RecipeGen_ShapedCrafting.generateRecipes(matInfo); + RecipeGen_DustGeneration.generateRecipes(matInfo); + if (matInfo != ALLOY.ENERGYCRYSTAL && matInfo != ALLOY.BLOODSTEEL) + RecipeGen_BlastSmelter.generateARecipe(matInfo); } + +} diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java index 5951d29c7e..036e542a29 100644 --- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java @@ -24,6 +24,15 @@ public class RecipeUtils { ArrayList<Object> validSlots = new ArrayList<Object>(); if (resultItem == null){ + Utils.LOG_INFO("Found a recipe with an invalid output, yet had a valid inputs. Skipping."); + return false; + } + + if (slot_1 == null && slot_2 == null && slot_3 == null && + slot_4 == null && slot_5 == null && slot_6 == null && + 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."); return false; } diff --git a/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png.png b/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png Binary files differindex 49b5236a14..49b5236a14 100644 --- a/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png.png +++ b/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png |
