aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-10-21 13:49:57 +0200
committerDream-Master <dream-master@gmx.net>2018-10-21 13:49:57 +0200
commit751e5df63fdccb5eca78f0a8e0d1346785a9a547 (patch)
treed0135bec8b16a92339f06f2b37db438b2d57b8ca /src
parent9181ef364859d4dc6399ce7a8e0ef6dc26561e8e (diff)
downloadGT5-Unofficial-751e5df63fdccb5eca78f0a8e0d1346785a9a547.tar.gz
GT5-Unofficial-751e5df63fdccb5eca78f0a8e0d1346785a9a547.tar.bz2
GT5-Unofficial-751e5df63fdccb5eca78f0a8e0d1346785a9a547.zip
Revert "Revert "put hatch mv recipes to crafting recipe loaders.""
This reverts commit 9181ef364859d4dc6399ce7a8e0ef6dc26561e8e.
Diffstat (limited to 'src')
-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, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index d593f11af5..1b1f76cbd0 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -19,6 +19,8 @@ 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.");
@@ -837,5 +839,8 @@ 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 742e950a5e..da12fa2462 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -249,7 +249,6 @@ 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));
@@ -264,7 +263,6 @@ 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));