From e9388f4d04d23b1de784d6bb182b5204a7675a5b Mon Sep 17 00:00:00 2001
From: PSYCHEER <42911029+PSYCHEER@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:52:45 +0100
Subject: [PATCH] Fixed conflict
[eco] Exception in packet listener com.willfp.eco.internal.spigot.proxy.v1_21_4.common.packet.display.PacketWindowItems for packet net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket! [15:52:44 WARN]: java.lang.ClassCastException: class java.lang.String cannot be cast to class net.minecraft.network.chat.Component (java.lang.String is in module java.base of loader 'bootstrap'; net.minecraft.network.chat.Component is in unnamed module of loader java.net.URLClassLoader @5e91993f)
...
---
VanillaCustomizer-core/pom.xml | 6 ++++++
.../customization/changes/LoreInsert.java | 8 ++++----
.../java/dev/lone/vanillacustomizer/utils/ConfigFile.java | 6 +++++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/VanillaCustomizer-core/pom.xml b/VanillaCustomizer-core/pom.xml
index 90404a9..c266b4a 100644
--- a/VanillaCustomizer-core/pom.xml
+++ b/VanillaCustomizer-core/pom.xml
@@ -90,6 +90,12 @@
24.0.0
compile
+
+ ca.bkaw
+ paper-nms
+ 1.21.4-SNAPSHOT
+ compile
+
diff --git a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/customization/changes/LoreInsert.java b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/customization/changes/LoreInsert.java
index 47835d9..d8becb6 100644
--- a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/customization/changes/LoreInsert.java
+++ b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/customization/changes/LoreInsert.java
@@ -45,14 +45,14 @@ public class LoreInsert implements IChange
int i = index;
for (String line : lines)
{
- loreNMS.add(i, Utils.legacyToNMS(IChange.replacePlaceholders(session, line)));
+ loreNMS.add(i, Utils.jsonToNMS(IChange.replacePlaceholders(session, line)));
i++;
}
}
else // If it's out of bounds I just append at the end.
{
for (String line : lines)
- loreNMS.add(Comp.legacyToJson(IChange.replacePlaceholders(session, line)));
+ loreNMS.add(Utils.jsonToNMS(IChange.replacePlaceholders(session, line)));
}
}
@@ -101,11 +101,11 @@ public class LoreInsert implements IChange
if (loreNMS == null)
{
loreNMS = new ArrayList<>();
- loreNMS.add(Utils.legacyToNMS(line));
+ loreNMS.add(Utils.jsonToNMS(line));
}
else
{
- loreNMS.add(index, Utils.legacyToNMS(line));
+ loreNMS.add(index, Utils.jsonToNMS(line));
}
nbt.setLore(loreNMS);
diff --git a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/utils/ConfigFile.java b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/utils/ConfigFile.java
index 339314a..bde9aed 100644
--- a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/utils/ConfigFile.java
+++ b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/utils/ConfigFile.java
@@ -2,7 +2,6 @@ package dev.lone.vanillacustomizer.utils;
import org.jetbrains.annotations.NotNull;
import dev.lone.vanillacustomizer.Main;
-import dev.lone.vanillacustomizer.nms.NMS;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
@@ -30,6 +29,11 @@ import java.util.regex.Pattern;
/**
* 2020-01-08 LoneDev
*/
+
+/**
+ * 2025-02-16 PSYCHEER
+ */
+
@SuppressWarnings("unused")
public class ConfigFile
{