aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-04-08 22:43:02 +0100
committerGitHub <noreply@github.com>2023-04-08 23:43:02 +0200
commitd550cd09df4cbb7e68e49bab9ca090cf90425f99 (patch)
tree3722113c29e520d9c2c98264fdd189695a92265c /src/main/java/gregtech/loaders
parent32d081720f26036f05559d4124ed0a51377c1f6f (diff)
downloadGT5-Unofficial-d550cd09df4cbb7e68e49bab9ca090cf90425f99.tar.gz
GT5-Unofficial-d550cd09df4cbb7e68e49bab9ca090cf90425f99.tar.bz2
GT5-Unofficial-d550cd09df4cbb7e68e49bab9ca090cf90425f99.zip
Kill Disassembler 🔪 (#1855)
* Kill disassembler * Kill disassembler * Change arc furnace to fulfil Dreams request. --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java1
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java68
2 files changed, 7 insertions, 62 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 06f7884875..5318e6cb39 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -124,7 +124,6 @@ public class GT_Achievements {
null),
"highpowerdrill",
false);
- registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false);
registerAchievement(
"unitool",
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 ec1866b375..caaa8f16dd 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -5677,63 +5677,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten),
'G', new ItemStack(Blocks.glass, 1) });
- ItemList.Machine_LV_Disassembler.set(
- new GT_MetaTileEntity_Disassembler(
- 451,
- "basicmachine.disassembler.tier.01",
- "Basic Disassembler",
- 1).getStackForm(1L));
- ItemList.Machine_MV_Disassembler.set(
- new GT_MetaTileEntity_Disassembler(
- 452,
- "basicmachine.disassembler.tier.02",
- "Advanced Disassembler",
- 2).getStackForm(1L));
- ItemList.Machine_HV_Disassembler.set(
- new GT_MetaTileEntity_Disassembler(
- 453,
- "basicmachine.disassembler.tier.03",
- "Advanced Disassembler II",
- 3).getStackForm(1L));
- ItemList.Machine_EV_Disassembler.set(
- new GT_MetaTileEntity_Disassembler(
- 454,
- "basicmachine.disassembler.tier.04",
- "Advanced Disassembler III",
- 4).getStackForm(1L));
- ItemList.Machine_IV_Disassembler.set(
- new GT_MetaTileEntity_Disassembler(
- 455,
- "basicmachine.disassembler.tier.05",
- "Advanced Disassembler IV",
- 5).getStackForm(1L));
-
- GT_ModHandler.addCraftingRecipe(
- ItemList.Machine_LV_Disassembler.get(1L),
- bitsd,
- new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LV, 'A', ItemList.Robot_Arm_LV, 'C',
- OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin) });
- GT_ModHandler.addCraftingRecipe(
- ItemList.Machine_MV_Disassembler.get(1L),
- bitsd,
- new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_MV, 'A', ItemList.Robot_Arm_MV, 'C',
- OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) });
- GT_ModHandler.addCraftingRecipe(
- ItemList.Machine_HV_Disassembler.get(1L),
- bitsd,
- new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_HV, 'A', ItemList.Robot_Arm_HV, 'C',
- OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold) });
- GT_ModHandler.addCraftingRecipe(
- ItemList.Machine_EV_Disassembler.get(1L),
- bitsd,
- new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_EV, 'A', ItemList.Robot_Arm_EV, 'C',
- OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) });
- GT_ModHandler.addCraftingRecipe(
- ItemList.Machine_IV_Disassembler.get(1L),
- bitsd,
- new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_IV, 'A', ItemList.Robot_Arm_IV, 'C',
- OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) });
-
if (Forestry.isModLoaded()) {
ItemList.Machine_IndustrialApiary.set(
new GT_MetaTileEntity_IndustrialApiary(
@@ -8055,6 +7998,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G',
OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L));
+
ItemList.Machine_MV_ArcFurnace.set(
new GT_MetaTileEntity_BasicMachine_GT_Recipe(
652,
@@ -8105,6 +8049,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G',
OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L));
+
ItemList.Machine_EV_ArcFurnace.set(
new GT_MetaTileEntity_BasicMachine_GT_Recipe(
654,
@@ -8114,7 +8059,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"",
GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
1,
- 4,
+ 9,
48000,
0,
1,
@@ -8130,6 +8075,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G',
OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L));
+
ItemList.Machine_IV_ArcFurnace.set(
new GT_MetaTileEntity_BasicMachine_GT_Recipe(
655,
@@ -8139,7 +8085,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"",
GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes,
1,
- 4,
+ 9,
64000,
0,
1,
@@ -8243,7 +8189,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"",
GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes,
1,
- 4,
+ 9,
8000,
0,
1,
@@ -8269,7 +8215,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"",
GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes,
1,
- 4,
+ 9,
16000,
0,
1,