From 5baf151b78b3cc32e0e5984725ff952ece75210d Mon Sep 17 00:00:00 2001 From: LotusRPG Date: Sat, 4 Apr 2026 00:15:08 +0200 Subject: [PATCH 1/2] LOTUS CHANGES --- codex-api/pom.xml | 2 +- codex-bungee/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codex-api/pom.xml b/codex-api/pom.xml index 620826c..e256f4a 100644 --- a/codex-api/pom.xml +++ b/codex-api/pom.xml @@ -6,7 +6,7 @@ studio.magemonkey codex-parent - 1.1.1-R2.1-SNAPSHOT + 1.1.1-R0.17-SNAPSHOT codex-api diff --git a/codex-bungee/pom.xml b/codex-bungee/pom.xml index 71bf12c..ebdb74d 100644 --- a/codex-bungee/pom.xml +++ b/codex-bungee/pom.xml @@ -6,7 +6,7 @@ studio.magemonkey codex-parent - 1.1.1-R2.1-SNAPSHOT + 1.1.1-R0.17-SNAPSHOT codex-bungee diff --git a/pom.xml b/pom.xml index 31d6d83..af3a6e3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ codex-parent - 1.1.1-R2.1-SNAPSHOT + 1.1.1-R0.17-SNAPSHOT pom CodexParent The core plugin for VoidEdge plugins From 71d4702df02842eafea4c2fda770d7479a4012c6 Mon Sep 17 00:00:00 2001 From: LotusRPG Date: Tue, 12 May 2026 12:06:58 +0200 Subject: [PATCH 2/2] chore: apply lotus-changes from mc-plugins workspace --- codex-api/pom.xml | 2 +- .../magemonkey/codex/nms/v1_21_10/NMSImpl.java | 10 ++++++++-- .../magemonkey/codex/nms/v1_21_11/NMSImpl.java | 12 ++++++++---- .../magemonkey/codex/nms/v1_21_7/NMSImpl.java | 13 ++++++++++--- codex-nms/pom.xml | 3 ++- pom.xml | 10 +++++----- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/codex-api/pom.xml b/codex-api/pom.xml index 3870d3b..e256f4a 100644 --- a/codex-api/pom.xml +++ b/codex-api/pom.xml @@ -44,7 +44,7 @@ com.nexomc nexo - 1.23 + 1.21.0 provided diff --git a/codex-nms/codex-nms-v1_21_10/src/main/java/studio/magemonkey/codex/nms/v1_21_10/NMSImpl.java b/codex-nms/codex-nms-v1_21_10/src/main/java/studio/magemonkey/codex/nms/v1_21_10/NMSImpl.java index 07fad30..32b2e44 100644 --- a/codex-nms/codex-nms-v1_21_10/src/main/java/studio/magemonkey/codex/nms/v1_21_10/NMSImpl.java +++ b/codex-nms/codex-nms-v1_21_10/src/main/java/studio/magemonkey/codex/nms/v1_21_10/NMSImpl.java @@ -272,9 +272,15 @@ public Objective registerNewObjective(Scoreboard scoreboard, Objective objective @SuppressWarnings("deprecation") public HoverEvent getHoverEvent(@NotNull ItemStack itemStack) { String components = itemStack.getItemMeta() != null ? itemStack.getItemMeta().getAsString() : "{}"; + + // Naprawa booleanów components = components.replaceAll(": ?0b", ": false") - .replaceAll(": ?1b", ": true") - .replaceAll(": ?(\\d+\\.\\d+)d", ": $1"); + .replaceAll(": ?1b", ": true"); + + // Naprawa liczb z przyrostkami f / d (np. "1.0f", "-2.5d") + // Usuwa cudzysłowy i przyrostek, zostawia czystą liczbę (JSON) + components = components.replaceAll("\"((-?\\d+(?:\\.\\d+)?)[fd])\"", "$2"); + return new HoverEvent(HoverEvent.Action.SHOW_ITEM, new ComponentsShowItem( itemStack.getType().getKey().toString(), diff --git a/codex-nms/codex-nms-v1_21_11/src/main/java/studio/magemonkey/codex/nms/v1_21_11/NMSImpl.java b/codex-nms/codex-nms-v1_21_11/src/main/java/studio/magemonkey/codex/nms/v1_21_11/NMSImpl.java index e6afbbf..7a13666 100644 --- a/codex-nms/codex-nms-v1_21_11/src/main/java/studio/magemonkey/codex/nms/v1_21_11/NMSImpl.java +++ b/codex-nms/codex-nms-v1_21_11/src/main/java/studio/magemonkey/codex/nms/v1_21_11/NMSImpl.java @@ -66,7 +66,6 @@ public class NMSImpl implements NMS { public String getVersion() { return "1.21.11"; } - @NotNull @Override public Object getConnection(Player player) { @@ -272,10 +271,15 @@ public Objective registerNewObjective(Scoreboard scoreboard, Objective objective @SuppressWarnings("deprecation") public HoverEvent getHoverEvent(@NotNull ItemStack itemStack) { String components = itemStack.getItemMeta() != null ? itemStack.getItemMeta().getAsString() : "{}"; + + // Naprawa booleanów components = components.replaceAll(": ?0b", ": false") - .replaceAll(": ?1b", ": true") - .replaceAll(": ?(\\d+\\.\\d+)d", ": $1") - .replaceAll("\\b(\\d+\\.\\d+)f\\b", "$1"); + .replaceAll(": ?1b", ": true"); + + // Naprawa liczb z przyrostkami f / d (np. "1.0f", "-2.5d") + // Usuwa cudzysłowy i przyrostek, zostawia czystą liczbę (JSON) + components = components.replaceAll("\"((-?\\d+(?:\\.\\d+)?)[fd])\"", "$2"); + return new HoverEvent(HoverEvent.Action.SHOW_ITEM, new ComponentsShowItem( itemStack.getType().getKey().toString(), diff --git a/codex-nms/codex-nms-v1_21_7/src/main/java/studio/magemonkey/codex/nms/v1_21_7/NMSImpl.java b/codex-nms/codex-nms-v1_21_7/src/main/java/studio/magemonkey/codex/nms/v1_21_7/NMSImpl.java index bb2e2a3..4bcb516 100644 --- a/codex-nms/codex-nms-v1_21_7/src/main/java/studio/magemonkey/codex/nms/v1_21_7/NMSImpl.java +++ b/codex-nms/codex-nms-v1_21_7/src/main/java/studio/magemonkey/codex/nms/v1_21_7/NMSImpl.java @@ -284,12 +284,19 @@ public Objective registerNewObjective(Scoreboard scoreboard, Objective objective } @Override - @SuppressWarnings("deprecation") public HoverEvent getHoverEvent(@NotNull ItemStack itemStack) { + System.out.println("[DEBUG] getHoverEvent FIXED for 1.21.7"); String components = itemStack.getItemMeta() != null ? itemStack.getItemMeta().getAsString() : "{}"; + + // Naprawa booleanów components = components.replaceAll(": ?0b", ": false") - .replaceAll(": ?1b", ": true") - .replaceAll(": ?(\\d+\\.\\d+)d", ": $1"); + .replaceAll(": ?1b", ": true"); + + // Naprawa liczb z przyrostkami f / d (w cudzysłowie lub bez) + components = components.replaceAll("(-?\\d+(?:\\.\\d+)?)[fd]", "$1"); + + System.out.println("[DEBUG] After fix: " + components); + return new HoverEvent(HoverEvent.Action.SHOW_ITEM, new ComponentsShowItem( itemStack.getType().getKey().toString(), diff --git a/codex-nms/pom.xml b/codex-nms/pom.xml index 9400dcc..eaa78b2 100644 --- a/codex-nms/pom.xml +++ b/codex-nms/pom.xml @@ -28,7 +28,7 @@ A collection of NMS libraries for Codex - codex-nms-v1_16_5 + codex-nms-v1_17_1 codex-nms-v1_18_2 codex-nms-v1_19_4 @@ -43,6 +43,7 @@ codex-nms-v1_21_7 codex-nms-v1_21_10 codex-nms-v1_21_11 + diff --git a/pom.xml b/pom.xml index 4535380..e6d34b8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ studio.magemonkey magemonkey-parent - 1.21.11-R2 + 1.21.11-R1 codex-parent - 1.1.1-R0.17-SNAPSHOT + 1.1.1-R2.1-SNAPSHOT pom CodexParent The core plugin for VoidEdge plugins @@ -89,12 +89,12 @@ com.sk89q.worldedit worldedit-bukkit - 7.4.2 + 7.4.1 com.sk89q.worldedit worldedit-core - 7.4.2 + 7.4.1 io.netty @@ -303,4 +303,4 @@ ${deploy.url}/releases - + \ No newline at end of file