Fix and upgrade Pyrotech integration #333

CaliforniaDemise · 2025-09-19T18:18:05Z

changes in this PR:

Fix game crash when Pyrotech modules are disabled.
Fix broken examples and remove unnecessary restrictions.
Add integration for missing machines (sawmills, crucibles and Mechanical Compacting Bin)
Add recipe inheritance. Inherited recipes get added to more advanced machines.
Add and change examples for recipe inheritance.

Some machines can't have inputs with stack sizes larger than one.

- Update examples to show inheritance. - Add inheritance. Inherited recipe will be added to the machines more advanced than the machine. - Add support for missing machines: sawmills, crucibles and Mechanical Compacting Bin.

WaitingIdly

need to run /gs generateWiki (or enable it in gradle.properties) and then fill in the missing lang keys.

WaitingIdly · 2025-09-20T06:34:37Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/PyroTech.java

+    }
+
+    private static <T> T register(Class<? extends ModuleBase> moduleClass, Supplier<T> supplier) {
+        if (ModPyrotech.INSTANCE.isModuleEnabled(moduleClass)) {


can replace with
@Override public boolean isEnabled() { return ModPyrotech.INSTANCE.isModuleEnabled(moduleClass) } in the relevant classes

That doesn't work because when ForgeRegistryWrappers initialize, they need to get ForgeRegistry that's not null. Which is the reason why it crashes in the first place.

ah, i see. do you think making a changer higher up and modifying the ForgeRegistryWrapper with something like this.registry = isEnabled() ? Objects.requireNonNull(registry) : null would be reasonable?

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/StoneCrucible.java

WaitingIdly · 2025-09-20T06:37:29Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Anvil.java

+            if (inherit) {
+                String name = null;
+                if (tier.ordinal() < 2) {
+                    name = tier.name().toLowerCase(Locale.US) + "_anvil";


i think Locale.ROOT or Locale.ENGLISH? is this actually needed?

Locale.ROOT can lead to Turkish which will lowercase I to ı

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Anvil.java

WaitingIdly · 2025-09-20T06:40:38Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/BrickSawmill.java

+        @Override
+        public void validate(GroovyLog.Msg msg) {
+            validateItems(msg, 1, 2, 1, 1);
+            msg.add(duration < 0, "duration must be a non negative integer, yet it was {}", duration);


this allows a duration of 0, which is annotated @Property(comp = @Comp(gte = 1)). one of these should be adjusted

WaitingIdly · 2025-09-20T06:44:52Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/MechanicalCompactingBin.java

+        public @Nullable MechanicalCompactingBinRecipe register() {
+            if (!validate()) return null;
+            MechanicalCompactingBinRecipe recipe = new MechanicalCompactingBinRecipe(output.get(0), input.get(0).toMcIngredient(), input.get(0).getAmount(), hits.isEmpty() ? ModuleTechBasicConfig.COMPACTING_BIN.TOOL_USES_REQUIRED_PER_HARVEST_LEVEL : hits.toIntArray()).setRegistryName(super.name);
+            input.get(0).setAmount(1);


why is this needed?

WaitingIdly

also need to apply spotless (its task 6)

WaitingIdly · 2025-09-25T12:56:09Z

gradle.properties

 debug_prodigytech = false
 debug_projecte = false
-debug_pyrotech = false
+debug_pyrotech = true


reset to false

WaitingIdly · 2025-09-25T12:59:36Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/PyroTech.java

would prefer having the init be inline. maybe also sort the lines?

WaitingIdly · 2025-09-25T13:05:45Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Anvil.java

        @Property
        private AnvilRecipe.EnumType type;
-
        @Property
        private AnvilRecipe.EnumTier tier;


should have comp = @Comp(not = "null") for both of these, since thats how its validated. this is likely also true for any other enums in this compat

WaitingIdly · 2025-09-25T13:10:12Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Anvil.java

+            msg.add(hits <= 0, "duration must be a non negative integer that is larger than 0, yet it was {}", hits);
+            msg.add(type == null, "type cannot be null.");
            msg.add(tier == null, "tier cannot be null.");
            msg.add(super.name == null, "name cannot be null.");


all msg.add(super.name == null, "name cannot be null."); should be replaced with validateName();. should also be overriding getRecipeNamePrefix

WaitingIdly · 2025-09-25T13:11:46Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Bloomery.java

+        return new RecipeBuilder();
+    }
+
+    public BloomeryRecipe add(String name, ItemStack output, IIngredient input) {


several methods in this class, including this method, are not annotated - they should be annotated

WaitingIdly · 2025-09-25T14:37:44Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/StoneSawmill.java

+
+        @Override
+        public void validate(GroovyLog.Msg msg) {
+            validateItems(msg, 1, 2, 1, 1);


if the second ingredient is set, this also needs to validate that its in ModuleTechMachineConfig.STONE_SAWMILL.SAWMILL_BLADES, otherwise it will not be able to be inserted into that slot

WaitingIdly · 2025-09-25T14:38:25Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Worktable.java

+        removeByOutput(output, true);
+    }
+
+    public void removeByOutput(IIngredient output, boolean log) {


annotate @GroovyBlacklist, and the other methods you dont want being callable from groovyscript

WaitingIdly · 2025-09-25T14:40:26Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Worktable.java

+    @Property(property = "recipeFunction")
+    @Property(property = "recipeAction")
+    @Property(property = "name")
+    public static class Shapeless extends AbstractCraftingRecipeBuilder.AbstractShapeless<WorktableRecipe> {


also needs @Property(property = "replace")

WaitingIdly · 2025-09-25T14:43:25Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Worktable.java

+            msg.add(rec != null && rec.getRecipe().canFit(1000, 1000), () -> "a recipe with that name already exists! Either replace or remove the recipe first");
+            if (msg.postIfNotEmpty()) return null;
+            ShapelessCraftingRecipe recipe = new ShapelessCraftingRecipe(output.copy(), ingredients, recipeFunction, recipeAction);
+            rec = new WorktableRecipe(recipe, tool == IIngredient.EMPTY ? null : tool.toMcIngredient(), damage, null);


maybe add stages?

Don't want to get into another rabbit hole so I double it and give it to myself in future.

WaitingIdly · 2025-09-25T14:44:23Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Worktable.java

+    @Property(property = "recipeFunction")
+    @Property(property = "recipeAction")
+    @Property(property = "name")
+    public static class Shaped extends AbstractCraftingRecipeBuilder.AbstractShaped<WorktableRecipe> {


also needs @Property(property = "replace")

WaitingIdly · 2025-10-08T00:13:11Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Bloomery.java

+            if (slag == null) {
+                slag = ItemStack.EMPTY;
+            }
+            int minOutput = !bloom.isEmpty() ? 0 : 1;
+            if (slag == null) {
+                slag = bloom.isEmpty() ? new ItemStack(ModuleTechBloomery.Items.SLAG, 4) : ItemStack.EMPTY;
+            }


we have an if (slag == null) slag = ItemStack.EMPTY here, and then check if (slag == null) again just a few lines down. this selection also has an inverted ternary - !x ? a : b should be flipped to x ? b : a

WaitingIdly · 2025-10-08T00:21:12Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/WitherForge.java

+                                com.codetaylor.mc.athenaeum.util.IngredientHelper.fromStackWithNBT(recipe.getOutputBloom()),
+                                anvilHit,
+                                anvilType,
+                                Arrays.copyOf(recipe.getAnvilTiers(), recipe.getAnvilTiers().length),


dont need to copy the array

WaitingIdly

i think some of the add(x/y/z) methods are so complex as to not be worthwhile, and should be removed and the recipe requires the recipeBuilder directly.
like,

add(String, IIngredient, ItemStack, int, int)
add(String, IIngredient, ItemStack, int, int, boolean)
add(String, IIngredient, IIngredient, ItemStack, int, int)
add(String, IIngredient, IIngredient, ItemStack, int, int, boolean)

this is too complex.

theres also several comments (ie in PitKiln) that have not been modified or responded to.

WaitingIdly · 2025-10-08T14:16:15Z

src/main/resources/assets/groovyscript/lang/en_us.lang

+groovyscript.wiki.pyrotech.bloomery.addBloom0.inherit=Adds recipes in the format `name`, `bloomOutput`, `input`, `inherit`
+groovyscript.wiki.pyrotech.bloomery.addBloom0=Adds recipes in the format `name`, `bloomOutput`, `input`


this should explain what "addBloom" actually does - it just says "adds recipes" but whats the difference between that and just "add"?

WaitingIdly · 2025-10-08T14:17:29Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Bloomery.java

+            return anvilType(AnvilRecipe.EnumType.HAMMER);
+        }
+
+        @RecipeBuilderMethodDescription


needs (field = "anvilType")

WaitingIdly · 2025-10-08T14:18:14Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Bloomery.java

+        @Property(comp = @Comp(gt = 0))
+        private int anvilHit = ModuleTechBloomeryConfig.BLOOM.HAMMER_HITS_IN_ANVIL_REQUIRED;


er, set defaultValue to indicate it pulls from a config?

WaitingIdly · 2025-10-08T14:18:43Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/Bloomery.java

+        @RecipeBuilderMethodDescription
+        public RecipeBuilder anvilTier(AnvilRecipe.EnumTier tier) {
+            anvilTiers.add(tier);
+            return this;
+        }
+
+        @RecipeBuilderMethodDescription(field = "anvilTier")
+        public RecipeBuilder tierGranite() {
+            return anvilTier(AnvilRecipe.EnumTier.GRANITE);
+        }
+
+        @RecipeBuilderMethodDescription(field = "anvilTier")
+        public RecipeBuilder tierIronclad() {
+            return anvilTier(AnvilRecipe.EnumTier.IRONCLAD);
+        }
+
+        @RecipeBuilderMethodDescription(field = "anvilTier")
+        public RecipeBuilder tierObsidian() {
+            return anvilTier(AnvilRecipe.EnumTier.OBSIDIAN);
+        }


all of these point to anvilTier, which doesnt exist - needs to be anvilTiers

WaitingIdly · 2025-10-08T14:20:43Z

src/main/resources/assets/groovyscript/lang/en_us.lang

+groovyscript.wiki.pyrotech.brick_sawmill.input.value=Sets the input required for the recipe. Second input value is an optional value for setting saw blade.
+groovyscript.wiki.pyrotech.brick_sawmill.duration.value=Sets the time required for the recipe to complete
+groovyscript.wiki.pyrotech.brick_sawmill.wood_chips.value=Sets the amount of wood chip to drop.
+groovyscript.wiki.pyrotech.brick_sawmill.add=Adds recipes in the format `name`, `input`, `(optional) blade`, `output`, `duration`, `woodChips`


(optional) blade, split into two different lang keys

WaitingIdly · 2025-10-08T14:30:56Z

src/main/resources/assets/groovyscript/lang/en_us.lang

+groovyscript.wiki.pyrotech.soaking_pot.description=Converts an item and liquid into a new item. Can require a campfire below
 groovyscript.wiki.pyrotech.soaking_pot.time.value=Sets the time required for the recipe to complete
 groovyscript.wiki.pyrotech.soaking_pot.campfireRequired.value=Sets if a campfire is required underneath
 groovyscript.wiki.pyrotech.soaking_pot.add=Adds recipes in the format `name`, `input`, `output`, `time`


recipe takes 5 inputs, this names 4

WaitingIdly · 2025-10-08T14:37:34Z

src/main/resources/assets/groovyscript/lang/en_us.lang

there are two missing lang keys, groovyscript.wiki.pyrotech.wither_forge.note0 and wood_chips. wood_chips needs to be changed to groovyscript.wiki.pyrotech.stone_sawmill.wood_chips.value or similar (since both stone + brick sawmills use the same key, perhaps groovyscript.wiki.pyrotech.sawmill.wood_chips.value)

WaitingIdly · 2025-10-08T14:37:48Z

src/main/java/com/cleanroommc/groovyscript/compat/mods/pyrotech/WitherForge.java

same issues that apply to the Bloomery also apply to the Wither Forge.

CaliforniaDemise added 4 commits September 18, 2025 16:01

Check if module exists before applying Pyrotech recipe registry.

829038f

- Fixes CleanroomMC#318

Fix Pyrotech examples.

d9befd0

Some machines can't have inputs with stack sizes larger than one.

Check modules before adding inherited recipes.

36bb767

WaitingIdly requested changes Sep 20, 2025

View reviewed changes

CaliforniaDemise added 5 commits September 20, 2025 14:11

Check for 0 in Pyrotech recipe builder properties.

5c4d8ef

Remove unnecessary input amount sets.

a9876c4

Change ForgeRegistryWrapper for checking disabled modules.

b81261c

Add missing wiki pages and translations. Add notes for inheritance.

2c507c6

Add support for Bloomery, Wither Forge, Worktable and Pit Burning.

dec4acc

CaliforniaDemise requested a review from WaitingIdly September 22, 2025 22:50

WaitingIdly requested changes Sep 25, 2025

View reviewed changes

Inline and sort.

3e03ca9

brachy84 added enhancement New feature or request mod compat Relating to compatability with a mod or features of a mod labels Oct 5, 2025

Add missing annotations and change other forgotten stuff.

dded536

CaliforniaDemise requested a review from WaitingIdly October 7, 2025 19:12

WaitingIdly reviewed Oct 8, 2025

View reviewed changes

Change Wither Forge and Bloomery support

d0a571e

CaliforniaDemise requested a review from WaitingIdly October 8, 2025 12:33

WaitingIdly requested changes Oct 8, 2025

View reviewed changes

		groovyscript.wiki.pyrotech.bloomery.addBloom0.inherit=Adds recipes in the format `name`, `bloomOutput`, `input`, `inherit`
		groovyscript.wiki.pyrotech.bloomery.addBloom0=Adds recipes in the format `name`, `bloomOutput`, `input`

		@Property(comp = @Comp(gt = 0))
		private int anvilHit = ModuleTechBloomeryConfig.BLOOM.HAMMER_HITS_IN_ANVIL_REQUIRED;

Fix and upgrade Pyrotech integration #333

Are you sure you want to change the base?

Fix and upgrade Pyrotech integration #333

Uh oh!

Conversation

CaliforniaDemise commented Sep 19, 2025

Uh oh!

WaitingIdly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WaitingIdly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WaitingIdly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development