From b0521bb2e7e1dddcb999252603f77508d1baa8a2 Mon Sep 17 00:00:00 2001 From: MCSamuel Date: Tue, 21 Apr 2026 07:34:06 -0700 Subject: [PATCH 1/2] frog color fix --- .../denizen/utilities/MultiVersionHelper1_19.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java index e649c9aec1..e2b2ad70fc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java @@ -20,7 +20,11 @@ public static boolean colorIsApplicable(EntityType type) { // TODO Frog variants technically have registries on all supported versions public static String getColor(Entity entity, boolean includeDeprecated) { if (entity instanceof Frog frog) { - return String.valueOf(frog.getVariant()); + // TODO once 1.21 is the minimum supported version, replace with direct registry-based handling + if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) { + return Utilities.namespacedKeyToString(frog.getVariant().getKey()); + } + return frog.getVariant().toString(); } else if (entity instanceof Boat boat) { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) { From a5f202f60c031cad7a19594d59df9c24f3db5387 Mon Sep 17 00:00:00 2001 From: MCSamuel Date: Tue, 21 Apr 2026 07:47:17 -0700 Subject: [PATCH 2/2] remove todo --- .../denizenscript/denizen/utilities/MultiVersionHelper1_19.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java index e2b2ad70fc..27565f5574 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_19.java @@ -20,7 +20,6 @@ public static boolean colorIsApplicable(EntityType type) { // TODO Frog variants technically have registries on all supported versions public static String getColor(Entity entity, boolean includeDeprecated) { if (entity instanceof Frog frog) { - // TODO once 1.21 is the minimum supported version, replace with direct registry-based handling if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) { return Utilities.namespacedKeyToString(frog.getVariant().getKey()); }