diff --git a/examples/postInit/generated/factorytech_generated.groovy b/examples/postInit/generated/factorytech_generated.groovy index 0b6466343..1ea1d8af2 100644 --- a/examples/postInit/generated/factorytech_generated.groovy +++ b/examples/postInit/generated/factorytech_generated.groovy @@ -61,25 +61,6 @@ mods.factorytech.centrifuge.recipeBuilder() .register() -// Circuit Scribe: -// Converts an input itemstack into an output itemstack, with the ability to control if stone parts are allowed. - -mods.factorytech.circuit_scribe.removeByInput(item('factorytech:circuit_intermediate:8')) -// mods.factorytech.circuit_scribe.removeByOutput(item('factorytech:circuit_intermediate:8')) -// mods.factorytech.circuit_scribe.removeAll() - -mods.factorytech.circuit_scribe.recipeBuilder() - .input(item('minecraft:clay')) - .output(item('minecraft:diamond')) - .register() - -mods.factorytech.circuit_scribe.recipeBuilder() - .input(item('minecraft:gold_ingot')) - .output(item('minecraft:clay')) - .allowStoneParts() - .register() - - // Compression Chamber: // Converts an input itemstack and input fluidstack into an output itemstack. diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Centrifuge.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Centrifuge.java index 8d79bb9c4..c9e271da6 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Centrifuge.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Centrifuge.java @@ -63,11 +63,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Centrifuge recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 3); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/CircuitScribe.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/CircuitScribe.java deleted file mode 100644 index be6ce5f62..000000000 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/CircuitScribe.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cleanroommc.groovyscript.compat.mods.factorytech; - -import com.cleanroommc.groovyscript.api.GroovyLog; -import com.cleanroommc.groovyscript.api.IIngredient; -import com.cleanroommc.groovyscript.api.documentation.annotations.*; -import com.cleanroommc.groovyscript.compat.mods.ModSupport; -import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder; -import com.cleanroommc.groovyscript.registry.StandardListRegistry; -import dalapo.factech.auxiliary.MachineRecipes; -import net.minecraft.item.ItemStack; -import org.jetbrains.annotations.Nullable; - -import java.util.Collection; - -@RegistryDescription -public class CircuitScribe extends StandardListRegistry> { - - @Override - public Collection> getRecipes() { - return MachineRecipes.CIRCUIT_SCRIBE; - } - - @RecipeBuilderDescription(example = { - @Example(".input(item('minecraft:clay')).output(item('minecraft:diamond'))"), - @Example(".input(item('minecraft:gold_ingot')).output(item('minecraft:clay')).allowStoneParts()") - }) - public RecipeBuilder recipeBuilder() { - return new RecipeBuilder(); - } - - @MethodDescription(example = @Example("item('factorytech:circuit_intermediate:8')")) - public void removeByInput(IIngredient input) { - getRecipes().removeIf(r -> input.test(r.input()) && doAddBackup(r)); - } - - @MethodDescription(example = @Example(value = "item('factorytech:circuit_intermediate:8')", commented = true)) - public void removeByOutput(IIngredient output) { - getRecipes().removeIf(r -> output.test(r.getOutputStack()) && doAddBackup(r)); - } - - @Property(property = "input", comp = @Comp(eq = 1)) - @Property(property = "output", comp = @Comp(eq = 1)) - public static class RecipeBuilder extends AbstractRecipeBuilder> { - - @Property("groovyscript.wiki.factorytech.allowStoneParts.value") - private boolean allowStoneParts; - - @RecipeBuilderMethodDescription - public RecipeBuilder allowStoneParts(boolean allowStoneParts) { - this.allowStoneParts = allowStoneParts; - return this; - } - - @RecipeBuilderMethodDescription - public RecipeBuilder allowStoneParts() { - this.allowStoneParts = !this.allowStoneParts; - return this; - } - - @Override - public String getErrorMsg() { - return "Error adding Factory Tech Circuit Scribe recipe"; - } - - @Override - protected int getMaxItemInput() { - return 1; - } - - @Override - public void validate(GroovyLog.Msg msg) { - validateItems(msg, 1, 1, 1, 1); - validateFluids(msg); - } - - @Override - @RecipeBuilderRegistrationMethod - public @Nullable MachineRecipes.MachineRecipe register() { - if (!validate()) return null; - MachineRecipes.MachineRecipe recipe = null; - for (var stack : input.get(0).getMatchingStacks()) { - recipe = new MachineRecipes.MachineRecipe<>(stack, output.get(0), allowStoneParts); - ModSupport.FACTORY_TECH.get().circuitScribe.add(recipe); - } - return recipe; - } - } -} diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/FactoryTech.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/FactoryTech.java index ed6f7578a..de4df4dd7 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/FactoryTech.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/FactoryTech.java @@ -6,7 +6,9 @@ public class FactoryTech extends GroovyPropertyContainer { public final Agitator agitator = new Agitator(); public final Centrifuge centrifuge = new Centrifuge(); - public final CircuitScribe circuitScribe = new CircuitScribe(); + // Circuit Etcher is not supported because the Tile Entity in the mod is hardcoded + // to only accept quartz plates and output etched quartz plates, there's a recipe registry in the mod but it's not used + // https://gitlab.com/dalapo/FactoryTech/-/blob/master/src/main/java/dalapo/factech/tileentity/specialized/TileEntityCircuitScribe.java public final Compressor compressor = new Compressor(); public final Crucible crucible = new Crucible(); public final DeepDrill deepDrill = new DeepDrill(); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Grindstone.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Grindstone.java index fd6157478..ffefa447a 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Grindstone.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Grindstone.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Grindstone recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/HighTechFurnace.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/HighTechFurnace.java index 3b857475c..43bbf821e 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/HighTechFurnace.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/HighTechFurnace.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech High Tech Furnace recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MagnetCentrifuge.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MagnetCentrifuge.java index f7b32a4a0..928bbddba 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MagnetCentrifuge.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MagnetCentrifuge.java @@ -63,11 +63,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Magnet Centrifuge recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 3); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Magnetizer.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Magnetizer.java index 9b6a71564..c1f48b9eb 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Magnetizer.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Magnetizer.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Magnetizer recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MetalCutter.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MetalCutter.java index 23d2bf926..4b4c8eb20 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MetalCutter.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/MetalCutter.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Metal Cutter recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/OreDrill.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/OreDrill.java index 83d85032c..e3831936c 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/OreDrill.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/OreDrill.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Ore Drill recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Reclaimer.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Reclaimer.java index b915f75db..f33c2a36c 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Reclaimer.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Reclaimer.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Reclaimer recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Saw.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Saw.java index 485e1b6f6..887d4e5a5 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Saw.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/factorytech/Saw.java @@ -62,11 +62,6 @@ public String getErrorMsg() { return "Error adding Factory Tech Saw recipe"; } - @Override - protected int getMaxItemInput() { - return 1; - } - @Override public void validate(GroovyLog.Msg msg) { validateItems(msg, 1, 1, 1, 1); diff --git a/src/main/resources/assets/groovyscript/lang/en_us.lang b/src/main/resources/assets/groovyscript/lang/en_us.lang index 40b962a30..f4c908f6a 100644 --- a/src/main/resources/assets/groovyscript/lang/en_us.lang +++ b/src/main/resources/assets/groovyscript/lang/en_us.lang @@ -1624,10 +1624,6 @@ groovyscript.wiki.factorytech.agitator.description=Converts either one or two in groovyscript.wiki.factorytech.centrifuge.title=Centrifuge groovyscript.wiki.factorytech.centrifuge.description=Converts an input itemstack into up to 3 output itemstacks, with the ability to control if stone parts are allowed. -groovyscript.wiki.factorytech.circuit_scribe.title=Circuit Scribe -groovyscript.wiki.factorytech.circuit_scribe.description=Converts an input itemstack into an output itemstack, with the ability to control if stone parts are allowed. -groovyscript.wiki.factorytech.circuit_scribe.note0=Recipes will not appear properly in JEI - groovyscript.wiki.factorytech.compressor.title=Compression Chamber groovyscript.wiki.factorytech.compressor.description=Converts an input itemstack and input fluidstack into an output itemstack.