aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-11-07 17:16:40 +0100
committerGitHub <noreply@github.com>2022-11-07 17:16:40 +0100
commitf8c701e137e17c711da8a8c102de99897d09b220 (patch)
tree8380d0ef957577e1fe5ab4cd4eff7632714d7094 /src/main
parent02ba85ba7cbc846a4df6c421a0b0a7c34c7572a1 (diff)
downloadGT5-Unofficial-f8c701e137e17c711da8a8c102de99897d09b220.tar.gz
GT5-Unofficial-f8c701e137e17c711da8a8c102de99897d09b220.tar.bz2
GT5-Unofficial-f8c701e137e17c711da8a8c102de99897d09b220.zip
Macerator tweaks (#427)
* change MAcerator Multi recipe add a Casing assembler recipe * spotless
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index afa5070046..afba0a6aec 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -172,8 +172,7 @@ public class RECIPES_Machines {
public static ItemStack EV_MACHINE_Centrifuge;
public static ItemStack EV_MACHINE_BendingMachine;
public static ItemStack IV_MACHINE_Wiremill;
- public static ItemStack HV_MACHINE_Macerator;
- public static ItemStack EV_MACHINE_Macerator;
+ public static ItemStack IV_MACHINE_Macerator;
public static ItemStack EV_MACHINE_Cutter;
public static ItemStack EV_MACHINE_MassFabricator;
public static ItemStack EV_MACHINE_Extruder;
@@ -1230,8 +1229,6 @@ public class RECIPES_Machines {
// IV MACHINES
if (!GTNH) {
EV_MACHINE_BendingMachine = ItemList.Machine_EV_Bender.get(1);
- HV_MACHINE_Macerator = ItemList.Machine_HV_Macerator.get(1);
- EV_MACHINE_Macerator = ItemList.Machine_EV_Macerator.get(1);
EV_MACHINE_MassFabricator = ItemList.Machine_EV_Massfab.get(1);
EV_MACHINE_Centrifuge = ItemList.Machine_EV_Centrifuge.get(1);
EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1);
@@ -1241,8 +1238,6 @@ public class RECIPES_Machines {
// Balanced opposites
else {
EV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1);
- HV_MACHINE_Macerator = ItemList.Machine_EV_Macerator.get(1);
- EV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1);
EV_MACHINE_MassFabricator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
? ItemUtils.getValueOfItemList("Machine_LuV_Massfab", ItemList.Machine_IV_Massfab)
.get(1)
@@ -1797,16 +1792,28 @@ public class RECIPES_Machines {
"stickLongPalladium",
"platePalladium",
RECIPE_IndustrialMacerationStackFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
+ ALLOY.INCONEL_625.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1),
+ },
+ GT_Values.NF,
+ RECIPE_IndustrialMacerationStackFrame,
+ 50,
+ 16);
// Industrial Maceration stack
RecipeUtils.addShapedGregtechRecipe(
"plateTungstenCarbide",
- EV_MACHINE_Macerator,
+ IV_MACHINE_Macerator,
"plateTungstenCarbide",
- HV_MACHINE_Macerator,
+ IV_MACHINE_Macerator,
CI.circuitTier7,
- HV_MACHINE_Macerator,
+ IV_MACHINE_Macerator,
"plateTungstenCarbide",
- CI.machineCasing_IV,
+ IV_MACHINE_Macerator,
"plateTungstenCarbide",
RECIPE_IndustrialMacerationStackController);
}