aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java148
1 files changed, 55 insertions, 93 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 178e84935d..8bc90b6ba0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.HashSet;
-import java.util.Set;
public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
@@ -36,17 +37,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
// Nuggets
if (ItemUtils.checkForInvalidItems(material.getNugget(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getIngot(1), new Object[] {
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getIngot(1),
+ new Object[] { material.getNugget(1), material.getNugget(1), material.getNugget(1),
+ material.getNugget(1), material.getNugget(1), material.getNugget(1),
+ material.getNugget(1), material.getNugget(1), material.getNugget(1) });
}
// Plates
@@ -54,26 +49,19 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
// Single Plate Shaped/Shapeless
if (ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- if (material.getPlate(1) != null && material.getIngot(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,
- new Object[] {
- "h",
- "B",
- "I",
- Character.valueOf('I'),
- material.getIngot(1),
- Character.valueOf('B'),
- material.getIngot(1)
- });
+ if (material.getPlate(1) != null && material.getIngot(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,
+ new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'),
+ material.getIngot(1) });
if (ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getPlate(1), new Object[] {
- gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1), material.getIngot(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getPlate(1),
+ new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1),
+ material.getIngot(1) });
// Double Plate Shaped/Shapeless
if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1))
@@ -82,32 +70,25 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getPlateDouble(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "I",
- "B",
- "h",
- Character.valueOf('I'),
- material.getPlate(1),
- Character.valueOf('B'),
- material.getPlate(1)
- });
+ new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'),
+ material.getPlate(1) });
if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1))
&& ItemUtils.checkForInvalidItems(material.getPlate(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getPlateDouble(1), new Object[] {
- gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1), material.getPlate(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getPlateDouble(1),
+ new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1),
+ material.getPlate(1) });
// Ring Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getRing(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (CORE.GTNH) {
if (GT_ModHandler.addCraftingRecipe(
material.getRing(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"h ", "fR", 'R', material.getRod(1)})) {
+ new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
@@ -132,14 +113,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Framebox Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getFrameBox(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFrameBox(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getFrameBox(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"RRR", "RwR", "RRR", 'R', material.getRod(1)})) {
+ new Object[] { "RRR", "RwR", "RRR", 'R', material.getRod(1) })) {
Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Failed");
@@ -147,14 +127,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Shaped Recipe - Bolts
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getBolt(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getBolt(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getBolt(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"s ", " R", 'R', material.getRod(1)})) {
+ new Object[] { "s ", " R", 'R', material.getRod(1) })) {
Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Failed");
@@ -162,14 +141,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Shaped Recipe - Fine Wire
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getFoil(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFoil(1))
&& ItemUtils.checkForInvalidItems(material.getFineWire(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getFineWire(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"Fx", 'F', material.getFoil(1)})) {
+ new Object[] { "Fx", 'F', material.getFoil(1) })) {
Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Failed");
@@ -183,7 +161,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getFoil(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"hP", 'P', material.getPlate(1)})) {
+ new Object[] { "hP", 'P', material.getPlate(1) })) {
Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Failed");
@@ -196,11 +174,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRod(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"f ", " I", 'I', material.getIngot(1)})) {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "f ", " I", 'I', material.getIngot(1) })) {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Shaped Recipe - Long Rod to two smalls
if (ItemUtils.checkForInvalidItems(material.getRod(1))
@@ -209,11 +187,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRod(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"s", "L", 'L', material.getLongRod(1)})) {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "s", "L", 'L', material.getLongRod(1) })) {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Two small to long rod
if (ItemUtils.checkForInvalidItems(material.getLongRod(1))
@@ -222,15 +200,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getLongRod(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"RhR", 'R', material.getRod(1)})) {
- Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "RhR", 'R', material.getRod(1) })) {
+ Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Rotor Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getRotor(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRotor(1))
&& ItemUtils.checkForInvalidItems(material.getRing(1))
&& !material.isRadioactive
&& ItemUtils.checkForInvalidItems(material.getPlate(1))
@@ -239,17 +216,8 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRotor(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PhP",
- "SRf",
- "PdP",
- 'P',
- material.getPlate(1),
- 'S',
- material.getScrew(1),
- 'R',
- material.getRing(1),
- })) {
+ new Object[] { "PhP", "SRf", "PdP", 'P', material.getPlate(1), 'S', material.getScrew(1), 'R',
+ material.getRing(1), })) {
Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Failed");
@@ -257,17 +225,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Gear Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getGear(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getGear(1))
&& ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getGear(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1),
- })) {
+ new Object[] { "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1), })) {
Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Failed");
@@ -275,16 +240,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Screws
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getScrew(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getScrew(1))
&& ItemUtils.checkForInvalidItems(material.getBolt(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getScrew(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "fB", "B ", 'B', material.getBolt(1),
- })) {
+ new Object[] { "fB", "B ", 'B', material.getBolt(1), })) {
Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Failed");