Skip to content

Commit b7a08ce

Browse files
committed
close #215
1 parent fb945a6 commit b7a08ce

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/main/java/com/cleanroommc/groovyscript/GroovyScriptConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,9 @@ public static class Compat {
1919

2020
@Config.Comment("Enables DE energy core compat. Config is mainly for other mods compat.")
2121
public boolean draconicEvolutionEnergyCore = true;
22+
23+
@Config.Name("ExtendedCrafting recipe maker makes grs recipes")
24+
@Config.Comment("If this is true, the recipe maker from ExtendedCrafting will produce a script for GroovyScript instead of CraftTweaker.")
25+
public boolean extendedCraftingRecipeMakerMakesGrsRecipes = true;
2226
}
2327
}

src/main/java/com/cleanroommc/groovyscript/core/mixin/extendedcrafting/ItemRecipeMakerMixin.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
import com.blakebr0.extendedcrafting.item.ItemRecipeMaker;
55
import com.blakebr0.extendedcrafting.lib.IExtendedTable;
66
import com.blakebr0.extendedcrafting.tile.TileEnderCrafter;
7+
import com.cleanroommc.groovyscript.GroovyScriptConfig;
78
import com.cleanroommc.groovyscript.helper.ingredient.GroovyScriptCodeConverter;
89
import com.google.common.base.Joiner;
910
import net.minecraft.item.ItemStack;
1011
import net.minecraftforge.oredict.OreDictionary;
1112
import org.spongepowered.asm.mixin.Mixin;
1213
import org.spongepowered.asm.mixin.Shadow;
14+
import org.spongepowered.asm.mixin.Unique;
1315
import org.spongepowered.asm.mixin.injection.At;
1416
import org.spongepowered.asm.mixin.injection.Inject;
1517
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -28,6 +30,7 @@ public abstract class ItemRecipeMakerMixin {
2830

2931
@Inject(method = "setClipboard", at = @At("HEAD"), cancellable = true)
3032
public void setClipboard(IExtendedTable table, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
33+
if (!GroovyScriptConfig.compat.extendedCraftingRecipeMakerMakesGrsRecipes) return;
3134
if (Desktop.isDesktopSupported()) {
3235
boolean ender = table instanceof TileEnderCrafter;
3336
StringBuilder string = (new StringBuilder("mods.extendedcrafting.")).append(ender ? "EnderCrafting" : "TableCrafting");
@@ -54,20 +57,21 @@ public void setClipboard(IExtendedTable table, ItemStack stack, CallbackInfoRetu
5457
cir.setReturnValue(false);
5558
}
5659

60+
@Unique
5761
public String groovyscript$makeItemArrayShapeless(IExtendedTable table) {
5862
StringBuilder builder = new StringBuilder();
5963
boolean isEmpty = true;
6064
for (ItemStack stack : table.getMatrix()) {
6165
if (!stack.isEmpty()) {
62-
builder.append(groovyscript$makeItem(stack))
63-
.append(", ");
66+
builder.append(groovyscript$makeItem(stack)).append(", ");
6467
isEmpty = false;
6568
}
6669
}
6770
if (isEmpty) return null;
6871
return builder.delete(builder.length() - 2, builder.length()).toString();
6972
}
7073

74+
@Unique
7175
public String groovyscript$makeItemArrayShaped(IExtendedTable table, boolean removeEmpties) {
7276
List<List<String>> matrix = new ArrayList<>();
7377
int row = 0;

0 commit comments

Comments
 (0)