From 78cf5904078a8be265848a7856e009e44dd92a4c Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Sun, 6 Aug 2023 23:45:07 -0400 Subject: [PATCH] made dissassembler map use reverse crafting proxy --- AntimatterAPI | 2 +- common/src/main/java/muramasa/gregtech/data/Machines.java | 2 +- common/src/main/java/muramasa/gregtech/data/RecipeMaps.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AntimatterAPI b/AntimatterAPI index 722e4c91f..7b8832dfa 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 722e4c91fa9463f4a3dc3b956208a1e38787d093 +Subproject commit 7b8832dfa3d13b73aeec40c4ca0f74b533404305 diff --git a/common/src/main/java/muramasa/gregtech/data/Machines.java b/common/src/main/java/muramasa/gregtech/data/Machines.java index ceed5eac0..d783734b4 100644 --- a/common/src/main/java/muramasa/gregtech/data/Machines.java +++ b/common/src/main/java/muramasa/gregtech/data/Machines.java @@ -70,7 +70,7 @@ public class Machines { public static BasicMachine COMPRESSOR = new BasicMachine(GTIRef.ID, "compressor").setMap(COMPRESSING).addFlags(GUI, ITEM); public static BasicMachine CUTTER = new BasicMachine(GTIRef.ID, "cutter").setMap(CUTTING).addFlags(GUI, ITEM, FLUID); public static BasicMachine DECAY_CHAMBER = new BasicMachine(GTIRef.ID, "decay_chamber").setMap(DECAYING).addFlags(GUI, ITEM, FLUID); - public static BasicMachine DISASSEMBLER = new BasicMachine(GTIRef.ID, "disassembler").setMap(new DisassemblingMap()).addFlags(GUI, ITEM).custom(); + public static BasicMachine DISASSEMBLER = new BasicMachine(GTIRef.ID, "disassembler").setMap(DISASSEMBLING).addFlags(GUI, ITEM).custom(); public static BasicMachine DISTILLERY = new BasicMachine(GTIRef.ID, "distillery").setMap(DISTILLING).addFlags(GUI, ITEM, FLUID).custom().renderContainedLiquids().setAllowVerticalFacing(true).setSound(GregTechSounds.EXTRACTOR, 0.6f); public static BasicMachine ELECTROLYZER = new BasicMachine(GTIRef.ID, "electrolyzer").setMap(ELECTROLYZING).addFlags(GUI, ITEM, FLUID).setSound(GregTechSounds.MAGNETIZER, 0.6f); public static BasicMachine ELECTROMAGNETIC_SEPARATOR = new BasicMachine(GTIRef.ID, "electromagnetic_separator").setMap(ELECTROMAGNETIC_SEPARATING).addFlags(GUI, ITEM); diff --git a/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java b/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java index 3b425b3c2..41f39624b 100644 --- a/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java +++ b/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java @@ -81,7 +81,7 @@ public class RecipeMaps { public static RecipeMap DEHYDRATING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GTIRef.ID, "dehydrating", new RecipeBuilder())); public static RecipeMap DISASSEMBLING = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GTIRef.ID, "disassembling", new RecipeBuilder())); + new RecipeMap<>(GTIRef.ID, "disassembling", new RecipeBuilder())).setProxy(RecipeProxies.REVERSE_CRAFTING_PROXY.apply(8, 200)); public static RecipeMap DISTILLATION = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GTIRef.ID, "distillation", new RecipeBuilder())).setGuiData(MULTI_DISPLAY_FLUID); public static RecipeMap CRYO_DISTILLATION = AntimatterAPI.register(RecipeMap.class,