Skip to content

Make recipes' names be pack id #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Make recipes' names be pack id #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/cleanroommc/groovyscript/helper/recipe/RecipeName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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--));
}
}