From da3fdf06cd3b12a0fed85578e991ddb05b466171 Mon Sep 17 00:00:00 2001 From: Luka de Vrij Date: Tue, 12 Dec 2023 16:25:21 +0100 Subject: [PATCH] 1.20.4 error in depend ProtocolSidebar cleaned up pom.xml because of this --- PureKitsFork/pom.xml | 88 +++++++++---------- .../lifelessnerd/purekitpvp/PureKitPvP.java | 2 - .../purekitpvp/files/LanguageConfig.java | 1 - .../me/lifelessnerd/purekitpvp/sample.java | 28 +++--- .../purekitpvp/utils/MyStringUtils.java | 30 +++---- PureKitsFork/src/main/resources/plugin.yml | 2 +- 6 files changed, 71 insertions(+), 80 deletions(-) diff --git a/PureKitsFork/pom.xml b/PureKitsFork/pom.xml index 15b926f..8ab6310 100644 --- a/PureKitsFork/pom.xml +++ b/PureKitsFork/pom.xml @@ -44,45 +44,45 @@ - - net.md-5 - specialsource-maven-plugin - 1.2.2 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-obf - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-jar-plugin 3.3.0 - F:\Minecraft\Servers\MC 1.20 Server\plugins + F:\Minecraft\Servers\MC 1.20.4 Server\plugins @@ -103,10 +103,10 @@ sonatype https://oss.sonatype.org/content/groups/public/ - - sk89q-repo - https://maven.enginehub.org/repo/ - + + + + sonatype-snapshots https://oss.sonatype.org/content/repositories/snapshots/ @@ -125,11 +125,11 @@ bukkit-sidebar 6.2.5-SNAPSHOT - - com.sk89q.worldguard - worldguard-bukkit - 7.0.9 - provided - + + + + + + diff --git a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/PureKitPvP.java b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/PureKitPvP.java index ca35027..afe2fcc 100644 --- a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/PureKitPvP.java +++ b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/PureKitPvP.java @@ -117,8 +117,6 @@ public final class PureKitPvP extends JavaPlugin { getServer().getPluginManager().registerEvents(new KillMessageInventory(this), this); - - getLogger().info("Enabled PureKitPvP"); getLogger().warning("Plugin active in world " + getConfig().getString("world") + ". To change this, see the config."); } diff --git a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/files/LanguageConfig.java b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/files/LanguageConfig.java index 0812c2b..6a6dc56 100644 --- a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/files/LanguageConfig.java +++ b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/files/LanguageConfig.java @@ -3,7 +3,6 @@ package me.lifelessnerd.purekitpvp.files; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import org.antlr.v4.misc.OrderedHashMap; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/sample.java b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/sample.java index 1d81e49..ae09e7e 100644 --- a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/sample.java +++ b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/sample.java @@ -12,7 +12,7 @@ public class sample { public static void main(String[] args) { - System.out.println(mapStringToEnchantment("{CraftEnchantment[minecraft:knockback]=2, CraftEnchantment[minecraft:fire_aspect]=2}")); + System.out.println(mapStringToEnchantment("{CraftEnchantment[minecraft:knockback]=11, CraftEnchantment[minecraft:fire_aspect]=2}")); @@ -20,28 +20,26 @@ public class sample { public static String mapStringToEnchantment(String string){ -//I {Enchantment:[minecraft:fire_protection, PROTECTION_FIRE]=4, Enchantment:[minecraft:infinity, INFINITY]=1} +//I {CraftEnchantment[minecraft:knockback]=2, CraftEnchantment[minecraft:fire_aspect]=2} StringBuilder result = new StringBuilder(); StringBuilder builder = new StringBuilder(string); builder.deleteCharAt(0); builder.deleteCharAt(string.length() - 2); string = builder.toString(); - String[] split = string.split("minecraft:"); - for (int index = 1; index < split.length; index++){ - String word = split[index]; - String[] splitAgain = word.split(","); - String levelString = splitAgain[1]; - String[] isolateLevel = levelString.split("="); - int level = Integer.parseInt(isolateLevel[isolateLevel.length - 1]); - word = splitAgain[0]; - word = MyStringUtils.itemCamelCase(word); - result.append(word).append(level).append(" "); + String[] split = string.split(","); + for(String substring : split){ + substring = substring.trim(); + substring = substring.substring(16); + String level = substring.split("=")[1]; + String splitEnchantment = substring.split("]")[0]; + String enchantment = splitEnchantment.split(":")[1]; + + result.append(MyStringUtils.itemCamelCase(enchantment)).append(level); + result.append(", "); } - - - return result.toString(); + return result.substring(0, result.length() - 2); //Output: Fire Protection 4, Infinity 1 } diff --git a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/utils/MyStringUtils.java b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/utils/MyStringUtils.java index d67734c..d6f57e0 100644 --- a/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/utils/MyStringUtils.java +++ b/PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/utils/MyStringUtils.java @@ -26,32 +26,28 @@ public class MyStringUtils { } public static String mapStringToEnchantment(String string){ - ///TODO Enchantment has become CraftEnchantment - breaks everything?! - //I {Enchantment:[minecraft:fire_protection, PROTECTION_FIRE]=4, Enchantment:[minecraft:infinity, INFINITY]=1} - System.out.println(string); + //{CraftEnchantment[minecraft:knockback]=11, CraftEnchantment[minecraft:fire_aspect]=2} StringBuilder result = new StringBuilder(); StringBuilder builder = new StringBuilder(string); builder.deleteCharAt(0); builder.deleteCharAt(string.length() - 2); string = builder.toString(); - String[] split = string.split("minecraft:"); - for (int index = 1; index < split.length; index++){ - String word = split[index]; - String[] splitAgain = word.split(","); - String levelString = splitAgain[1]; - String[] isolateLevel = levelString.split("="); - int level = Integer.parseInt(isolateLevel[isolateLevel.length - 1]); - word = splitAgain[0]; - word = MyStringUtils.itemCamelCase(word); - result.append(word).append(level).append(" "); + String[] split = string.split(","); + for(String substring : split){ + substring = substring.trim(); + substring = substring.substring(16); + String level = substring.split("=")[1]; + String splitEnchantment = substring.split("]")[0]; + String enchantment = splitEnchantment.split(":")[1]; + + result.append(MyStringUtils.itemCamelCase(enchantment)).append(level); + result.append(", "); } - - - return result.toString(); - //Output: Fire Protection 4, Infinity 1 + return result.substring(0, result.length() - 2); + //Output: Knockback 11, Fire Aspect 2 } public static String itemMetaToEffects(String string){ diff --git a/PureKitsFork/src/main/resources/plugin.yml b/PureKitsFork/src/main/resources/plugin.yml index 527edc3..0b27779 100644 --- a/PureKitsFork/src/main/resources/plugin.yml +++ b/PureKitsFork/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ main: me.lifelessnerd.purekitpvp.PureKitPvP api-version: 1.19 authors: [ LifelessNerd ] description: KitPVP plugin, made to work with PureKits kits (abandoned) -depend: +softdepend: - WorldGuard commands: getkit: