From fade36c7a5b790780a5c9dc43795af25166698a4 Mon Sep 17 00:00:00 2001 From: Alexander Noyle Date: Sat, 3 Jan 2026 07:36:17 -0500 Subject: [PATCH 1/2] Fix particles menu resource fallback --- src/main/java/cosmeticsOG/util/ResourceUtil.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/cosmeticsOG/util/ResourceUtil.java b/src/main/java/cosmeticsOG/util/ResourceUtil.java index f142c50..7ff4a1f 100644 --- a/src/main/java/cosmeticsOG/util/ResourceUtil.java +++ b/src/main/java/cosmeticsOG/util/ResourceUtil.java @@ -182,7 +182,14 @@ public class ResourceUtil { int menuVersion = particleMenuCompatibilityMap.getOrDefault(Math.min((int) CosmeticsOG.serverVersion, 14), 8); - return core.getResource("menus/particles_" + menuVersion + ".yml"); + InputStream versionedMenu = core.getResource("menus/particles_" + menuVersion + ".yml"); + if (versionedMenu != null) { + + return versionedMenu; + + } + + return core.getResource("menus/particles.yml"); } -- 2.47.3 From 9a07f9dd26b75be3af42900bea056e63e55133a4 Mon Sep 17 00:00:00 2001 From: Alexander Noyle Date: Sat, 3 Jan 2026 07:50:30 -0500 Subject: [PATCH 2/2] Include resources in shadow jar --- build.gradle.kts | 1 + src/main/java/cosmeticsOG/util/ResourceUtil.java | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7e057f1..6463228 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -62,6 +62,7 @@ tasks.withType().configureEach { // Ensure reproducible .ja tasks.shadowJar { exclude("org.bstats.*") // Exclude the bStats package from being shadowed. exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed. + from(sourceSets.main.get().resources) isEnableRelocation = true relocationPrefix = "${project.group}.shadow" archiveClassifier.set("") // Use empty string instead of null. diff --git a/src/main/java/cosmeticsOG/util/ResourceUtil.java b/src/main/java/cosmeticsOG/util/ResourceUtil.java index f142c50..7ff4a1f 100644 --- a/src/main/java/cosmeticsOG/util/ResourceUtil.java +++ b/src/main/java/cosmeticsOG/util/ResourceUtil.java @@ -182,7 +182,14 @@ public class ResourceUtil { int menuVersion = particleMenuCompatibilityMap.getOrDefault(Math.min((int) CosmeticsOG.serverVersion, 14), 8); - return core.getResource("menus/particles_" + menuVersion + ".yml"); + InputStream versionedMenu = core.getResource("menus/particles_" + menuVersion + ".yml"); + if (versionedMenu != null) { + + return versionedMenu; + + } + + return core.getResource("menus/particles.yml"); } -- 2.47.3