From 6f33937086161f30a7b2268e34077da1101f394a Mon Sep 17 00:00:00 2001 From: Waiting Idly <25394029+WaitingIdly@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:41:30 -0700 Subject: [PATCH] allow numbers in pack id --- .../java/com/cleanroommc/groovyscript/sandbox/RunConfig.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java b/src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java index 532ccd950..d0e14a403 100644 --- a/src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java +++ b/src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java @@ -74,12 +74,12 @@ public static JsonObject createDefaultJson() { private final String asmClass = null; private boolean debug; - private final boolean invalidPackId; private boolean warnedAboutInvalidPackId; private int packmodeConfigState; public static final String[] GROOVY_SUFFIXES = SandboxData.GROOVY_SUFFIXES; + private static final Pattern ID_PATTERN = Pattern.compile("[a-z0-9_]+"); public static boolean isGroovyFile(String path) { return SandboxData.isGroovyFile(path); @@ -88,8 +88,7 @@ public static boolean isGroovyFile(String path) { public RunConfig(JsonObject json) { String name = JsonHelper.getString(json, "", "packName", "name"); String id = JsonHelper.getString(json, "", "packId", "id"); - Pattern idPattern = Pattern.compile("[a-z_]+"); - this.invalidPackId = id.isEmpty() || !idPattern.matcher(id).matches(); + this.invalidPackId = id.isEmpty() || !ID_PATTERN.matcher(id).matches(); if (name.isEmpty() && !this.invalidPackId) { name = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, id).replace('_', ' '); }