diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipeBuilder.java b/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipeBuilder.java index e6c207e07..d6ae484de 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipeBuilder.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipeBuilder.java @@ -88,12 +88,12 @@ protected void handleReplace() { @GroovyBlacklist protected ResourceLocation createName(@Nullable String name, @Nullable String prefix) { if (name == null) { - return new ResourceLocation(GroovyScript.ID, prefix == null ? RecipeName.generate() : RecipeName.generate(prefix)); + return new ResourceLocation(GroovyScript.getRunConfig().getPackId(), prefix == null ? RecipeName.generate() : RecipeName.generate(prefix)); } if (name.contains(":")) { return new ResourceLocation(name); } - return new ResourceLocation(GroovyScript.ID, name); + return new ResourceLocation(GroovyScript.getRunConfig().getPackId(), name); } public static class Shaped extends CraftingRecipeBuilder { diff --git a/src/main/java/com/cleanroommc/groovyscript/helper/recipe/RecipeName.java b/src/main/java/com/cleanroommc/groovyscript/helper/recipe/RecipeName.java index 2b73e4c53..454cfaf33 100644 --- a/src/main/java/com/cleanroommc/groovyscript/helper/recipe/RecipeName.java +++ b/src/main/java/com/cleanroommc/groovyscript/helper/recipe/RecipeName.java @@ -6,9 +6,12 @@ public class RecipeName { private static int nextId = -1; - private static final String prefix = "groovyscript_"; + private static String prefix = ""; public static String generate() { + if (prefix.isEmpty()) + prefix = GroovyScript.getRunConfig().getPackId() + "_"; + return generate(prefix); } @@ -17,6 +20,6 @@ public static String generate(String prefix) { } public static ResourceLocation generateRl(String prefix) { - return new ResourceLocation(GroovyScript.ID, prefix + Integer.toHexString(nextId--)); + return new ResourceLocation(GroovyScript.getRunConfig().getPackId(), prefix + Integer.toHexString(nextId--)); } }