close #215

CleanroomMC · Aug 12, 2024 · b7a08ce · b7a08ce
1 parent fb945a6
commit b7a08ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java b/src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java
@@ -19,5 +19,9 @@ public static class Compat {
 
         @Config.Comment("Enables DE energy core compat. Config is mainly for other mods compat.")
         public boolean draconicEvolutionEnergyCore = true;
+
+        @Config.Name("ExtendedCrafting recipe maker makes grs recipes")
+        @Config.Comment("If this is true, the recipe maker from ExtendedCrafting will produce a script for GroovyScript instead of CraftTweaker.")
+        public boolean extendedCraftingRecipeMakerMakesGrsRecipes = true;
     }
 }
diff --git a/...n/java/com/cleanroommc/groovyscript/core/mixin/extendedcrafting/ItemRecipeMakerMixin.java b/...n/java/com/cleanroommc/groovyscript/core/mixin/extendedcrafting/ItemRecipeMakerMixin.java
@@ -4,12 +4,14 @@
 import com.blakebr0.extendedcrafting.item.ItemRecipeMaker;
 import com.blakebr0.extendedcrafting.lib.IExtendedTable;
 import com.blakebr0.extendedcrafting.tile.TileEnderCrafter;
+import com.cleanroommc.groovyscript.GroovyScriptConfig;
 import com.cleanroommc.groovyscript.helper.ingredient.GroovyScriptCodeConverter;
 import com.google.common.base.Joiner;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -28,6 +30,7 @@ public abstract class ItemRecipeMakerMixin {
 
     @Inject(method = "setClipboard", at = @At("HEAD"), cancellable = true)
     public void setClipboard(IExtendedTable table, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
+        if (!GroovyScriptConfig.compat.extendedCraftingRecipeMakerMakesGrsRecipes) return;
         if (Desktop.isDesktopSupported()) {
             boolean ender = table instanceof TileEnderCrafter;
             StringBuilder string = (new StringBuilder("mods.extendedcrafting.")).append(ender ? "EnderCrafting" : "TableCrafting");
@@ -54,20 +57,21 @@ public void setClipboard(IExtendedTable table, ItemStack stack, CallbackInfoRetu
         cir.setReturnValue(false);
     }
 
+    @Unique
     public String groovyscript$makeItemArrayShapeless(IExtendedTable table) {
         StringBuilder builder = new StringBuilder();
         boolean isEmpty = true;
         for (ItemStack stack : table.getMatrix()) {
             if (!stack.isEmpty()) {
-                builder.append(groovyscript$makeItem(stack))
-                        .append(", ");
+                builder.append(groovyscript$makeItem(stack)).append(", ");
                 isEmpty = false;
             }
         }
         if (isEmpty) return null;
         return builder.delete(builder.length() - 2, builder.length()).toString();
     }
 
+    @Unique
     public String groovyscript$makeItemArrayShaped(IExtendedTable table, boolean removeEmpties) {
         List<List<String>> matrix = new ArrayList<>();
         int row = 0;