aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-10-21 13:48:45 +0200
committerDream-Master <dream-master@gmx.net>2018-10-21 13:48:45 +0200
commit9181ef364859d4dc6399ce7a8e0ef6dc26561e8e (patch)
tree01e55a4380a8e7fd18b66260b362638f8998d4e9
parentd7b6ec34c307648f154311878740fb966e3cc82f (diff)
downloadGT5-Unofficial-9181ef364859d4dc6399ce7a8e0ef6dc26561e8e.tar.gz
GT5-Unofficial-9181ef364859d4dc6399ce7a8e0ef6dc26561e8e.tar.bz2
GT5-Unofficial-9181ef364859d4dc6399ce7a8e0ef6dc26561e8e.zip
Revert "put hatch mv recipes to crafting recipe loaders."
This reverts commit d7b6ec34c307648f154311878740fb966e3cc82f.
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java5
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 1b1f76cbd0..d593f11af5 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -19,8 +19,6 @@ public class GT_CraftingRecipeLoader implements Runnable {
private final static String aTextRailcraft = "Railcraft";
private final static String aTextMachineBeta = "machine.beta";
private final static String aTextMachineAlpha = "machine.alpha";
- private final static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
- private final static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | bits;
public void run() {
GT_Log.out.println("GT_Mod: Adding nerfed Vanilla Recipes.");
@@ -839,8 +837,5 @@ public class GT_CraftingRecipeLoader implements Runnable {
}
GT_ModHandler.addShapelessCraftingRecipe(Materials.Fireclay.getDust(2), new Object[]{Materials.Brick.getDust(1), Materials.Clay.getDust(1)});
-
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_MV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', GT_ModHandler.getModItem("irontank", "copperTank", 1L, 0)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_MV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', GT_ModHandler.getModItem("irontank", "copperTank", 1L, 0)});
}
}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index da12fa2462..742e950a5e 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -249,6 +249,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)});
GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_LV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)});
+ GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_MV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel),'X', GT_ModHandler.getModItem("irontank", "copperTank", 1L, 0)});
ItemList.Hatch_Output_ULV.set(new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm(1L));
ItemList.Hatch_Output_LV.set(new GT_MetaTileEntity_Hatch_Output(61, "hatch.output.tier.01", "Output Hatch (LV)", 1).getStackForm(1L));
@@ -263,6 +264,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_ULV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)});
GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_LV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)});
+ GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_MV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', GT_ModHandler.getModItem("irontank", "copperTank", 1L, 0)});
ItemList.Quantum_Tank_LV.set(new GT_MetaTileEntity_QuantumTank(120, "quantum.tank.tier.06", "Quantum Tank I", 6).getStackForm(1L));
ItemList.Quantum_Tank_MV.set(new GT_MetaTileEntity_QuantumTank(121, "quantum.tank.tier.07", "Quantum Tank II", 7).getStackForm(1L));