aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 3b5db4aab5..ec015b2690 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -28,6 +28,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
if (!CORE.GTNH) {
//Nuggets
+ if (material.getNugget(1) != null)
GT_ModHandler.addShapelessCraftingRecipe(
material.getIngot(1),
new Object[]{
@@ -46,6 +47,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
//Plates
//Single Plate Shaped/Shapeless
+ if (material.getPlate(1) != null)
GT_ModHandler.addCraftingRecipe(
material.getPlate(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
@@ -55,6 +57,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
Character.valueOf('B'),
material.getIngot(1)});
+ if (material.getPlate(1) != null)
GT_ModHandler.addShapelessCraftingRecipe(
material.getPlate(1),
new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
@@ -62,6 +65,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
material.getIngot(1)});
//Double Plate Shaped/Shapeless
+ if (material.getPlateDouble(1) != null)
GT_ModHandler.addCraftingRecipe(
material.getPlateDouble(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
@@ -71,6 +75,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
Character.valueOf('B'),
material.getPlate(1)});
+ if (material.getPlateDouble(1) != null)
GT_ModHandler.addShapelessCraftingRecipe(
material.getPlateDouble(1),
new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
@@ -78,7 +83,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
material.getPlate(1)});
//Ring Recipe
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getRing(1) != null){
if (LoadedMods.DreamCraft){
if (RecipeUtils.recipeBuilder(
"craftingToolHardHammer", null, null,
@@ -107,7 +112,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
//Framebox Recipe
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getFrameBox(1) != null){
final ItemStack stackStick = material.getRod(1);
if (RecipeUtils.recipeBuilder(
stackStick, stackStick, stackStick,
@@ -152,7 +157,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
//Shaped Recipe - Bolts
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getBolt(1) != null){
if (RecipeUtils.recipeBuilder(
"craftingToolSaw", null, null,
null, material.getRod(1), null,
@@ -167,6 +172,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
//Shaped Recipe - Ingot to Rod
+ if (material.getRod(1) != null)
if (RecipeUtils.recipeBuilder(
"craftingToolFile", null, null,
null, material.getIngot(1), null,
@@ -180,6 +186,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
//Shaped Recipe - Long Rod to two smalls
+ if (material.getRod(1) != null)
if (RecipeUtils.recipeBuilder(
"craftingToolSaw", null, null,
material.getLongRod(1), null, null,
@@ -192,6 +199,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
}
//Two small to long rod
+ if (material.getLongRod(1) != null)
if (RecipeUtils.recipeBuilder(
material.getRod(1), "craftingToolHardHammer", material.getRod(1),
null, null, null,
@@ -204,7 +212,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
}
//Rotor Recipe
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getRotor(1) != null){
if (RecipeUtils.recipeBuilder(
material.getPlate(1), "craftingToolHardHammer", material.getPlate(1),
material.getScrew(1), material.getRing(1), "craftingToolFile",
@@ -218,7 +226,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
}
//Gear Recipe
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getGear(1) != null){
if (RecipeUtils.recipeBuilder(
material.getRod(1), material.getPlate(1), material.getRod(1),
material.getPlate(1), "craftingToolWrench", material.getPlate(1),
@@ -232,7 +240,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{
}
//Screws
- if (!material.isRadioactive){
+ if (!material.isRadioactive && material.getScrew(1) != null){
if (RecipeUtils.recipeBuilder(
"craftingToolFile", material.getBolt(1), null,
material.getBolt(1), null, null,