diff --git a/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java b/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java index 9ec62d65..6f09f07f 100644 --- a/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java +++ b/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java @@ -45,7 +45,7 @@ public class RecipeMaps { public static RecipeMap CANNING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "canner", new RecipeBuilder())); public static RecipeMap CENTRIFUGING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "centrifuge", new RecipeBuilder())); public static RecipeMap COMPRESSING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "compressor", new SteamBuilder(STEAM_COMPRESSOR))); - public static RecipeMap CUTTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_cutter", new SteamBuilder(STEAM_CUTTER))); + public static RecipeMap CUTTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_cutter", new RecipeBuilder())); public static RecipeMap SMELTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "furnace", new RecipeBuilder()).setProxy(RecipeProxies.FURNACE_PROXY.apply(4, 60))); public static RecipeMap EXTRACTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extractor", new SteamBuilder(STEAM_EXTRACTOR))); public static RecipeMap EXTRUDING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extruder", new RecipeBuilder())); diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java index fe37934b..96df5e78 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java @@ -1,5 +1,7 @@ package trinsdar.gt4r.loader.machines; +import muramasa.antimatter.data.AntimatterMaterials; +import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -8,21 +10,28 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.BOLT; import static muramasa.antimatter.data.AntimatterMaterialTypes.PLATE; import static muramasa.antimatter.data.AntimatterMaterialTypes.ROD; +import static trinsdar.gt4r.data.Materials.Steam; import static trinsdar.gt4r.data.RecipeMaps.CUTTING; +import static trinsdar.gt4r.data.RecipeMaps.STEAM_CUTTER; public class CutterLoader { public static void init(){ PLATE.all().forEach(t -> { if (!t.has(BLOCK)) return; - long duration = Math.max(t.getMass(), 1) * 300; - CUTTING.RB().ii(RecipeIngredient.of(BLOCK.getMaterialTag(t), 1)).io(PLATE.get(t,9)).add(t.getId() + "_plate",duration, 30); + long duration = Math.max(t.getMass(), 1); + int multiplier = 1;//mat.has(AntimatterMaterialTypes.GEM) ? 8 : 3; + if (t == AntimatterMaterials.Diamond || t == AntimatterMaterials.NetherizedDiamond) + multiplier = 5; + int count = t.has(MaterialTags.QUARTZ_LIKE_BLOCKS) ? 4 : 9; + CUTTING.RB().ii(RecipeIngredient.of(BLOCK.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(PLATE.get(t,count)).add(t.getId() + "_plate",duration * multiplier, 30); + STEAM_CUTTER.RB().ii(BLOCK.getMaterialIngredient(t, 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(PLATE.get(t, count)).add(t.getId() + "_plate", duration * multiplier * 4, 30); }); BOLT.all().forEach(t -> { if (!t.has(ROD)) return; long duration = Math.max(t.getMass(), 1) * 4; - CUTTING.RB().ii(RecipeIngredient.of(ROD.getMaterialTag(t), 1)).io(BOLT.get(t,4)).add(t.getId() + "_bolt",duration, 30); + CUTTING.RB().ii(RecipeIngredient.of(ROD.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(BOLT.get(t,4)).add(t.getId() + "_bolt",duration, 30); }); - CUTTING.RB().ii(RecipeIngredient.of(Items.GLASS, 3)).io(new ItemStack(Items.GLASS_PANE)).add("glass_pane",50, 8); + CUTTING.RB().ii(RecipeIngredient.of(Items.GLASS, 3)).fi(AntimatterMaterials.Water.getLiquid(3)).io(new ItemStack(Items.GLASS_PANE)).add("glass_pane",50, 8); } }