Support 1.20.6

dough-api/pom.xml

@@ -167,10 +167,6 @@
             <id>enginehub-repo</id>
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
-        <repository>
-            <id>IntellectualSites</id>
-            <url>https://mvn.intellectualsites.com/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>funnyguilds-repo</id>
             <url>https://repo.panda-lang.org/releases</url>
@@ -415,6 +411,13 @@
             <artifactId>plugin</artifactId>
             <version>4.12.0</version>
             <scope>provided</scope>
+            <exclusions>
+                <!-- Exclude invalid dependency -->
+                <exclusion>
+                    <groupId>com.github.PikaMug</groupId>
+                    <artifactId>LocaleLib</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- HuskTowns -->

dough-items/src/main/java/io/github/bakedlibs/dough/items/ItemUtils.java

@@ -6,6 +6,8 @@
 import javax.annotation.Nullable;
 
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
@@ -174,8 +176,8 @@ public static void damageItem(@Nonnull ItemStack item, int damage, boolean ignor
         if (item.getType() != Material.AIR && item.getAmount() > 0) {
             int remove = damage;
 
-            if (!ignoreEnchantments && item.getEnchantments().containsKey(Enchantment.DURABILITY)) {
-                int level = item.getEnchantmentLevel(Enchantment.DURABILITY);
+            if (!ignoreEnchantments && item.getEnchantments().containsKey(Registry.ENCHANTMENT.get(NamespacedKey.minecraft("unbreaking")))) {
+                int level = item.getEnchantmentLevel(Registry.ENCHANTMENT.get(NamespacedKey.minecraft("unbreaking")));
 
                 for (int i = 0; i < damage; i++) {
                     if (Math.random() * 100 <= (60 + Math.floorDiv(40, (level + 1)))) {

dough-items/src/main/java/io/github/bakedlibs/dough/items/nms/ItemNameAdapter.java

@@ -7,6 +7,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.papermc.lib.PaperLib;
 import org.bukkit.inventory.ItemStack;
 
 import io.github.bakedlibs.dough.common.DoughLogger;
@@ -20,11 +21,19 @@ public interface ItemNameAdapter {
 
     public static @Nullable ItemNameAdapter get() {
         try {
-            MinecraftVersion version = MinecraftVersion.get();
-
             if (MinecraftVersion.isMocked()) {
                 // Special case for MockBukkit
                 return new ItemNameAdapterMockBukkit();
+            }
+
+            if (PaperLib.isPaper()) {
+                return new ItemNameAdapterPaper();
+            }
+
+            MinecraftVersion version = MinecraftVersion.get();
+
+            if (version.isAtLeast(1, 20, 5)) {
+                return new ItemNameAdapter20v5();
             } else if (version.isAtLeast(1, 20)) {
                 return new ItemNameAdapter20();
             } else if (version.isAtLeast(1, 19)) {

dough-items/src/main/java/io/github/bakedlibs/dough/items/nms/ItemNameAdapter20v5.java

@@ -0,0 +1,32 @@
+package io.github.bakedlibs.dough.items.nms;
+
+import io.github.bakedlibs.dough.reflection.ReflectionUtils;
+import io.github.bakedlibs.dough.versions.UnknownServerVersionException;
+import org.bukkit.inventory.ItemStack;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+class ItemNameAdapter20v5 implements ItemNameAdapter {
+
+    private final Method getCopy;
+    private final Method getName;
+    private final Method toString;
+
+    ItemNameAdapter20v5() throws NoSuchMethodException, SecurityException, ClassNotFoundException, UnknownServerVersionException {
+        super();
+
+        getCopy = ReflectionUtils.getOBCClass("inventory.CraftItemStack").getMethod("asNMSCopy", ItemStack.class);
+        getName = ReflectionUtils.getMethodOrAlternative(ReflectionUtils.getNetMinecraftClass("world.item.ItemStack"), "getDisplayName", "G");
+        toString = ReflectionUtils.getMethod(ReflectionUtils.getNetMinecraftClass("network.chat.IChatBaseComponent"), "getString");
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    public String getName(ItemStack item) throws IllegalAccessException, InvocationTargetException {
+        Object instance = getCopy.invoke(null, item);
+        return (String) toString.invoke(getName.invoke(instance));
+    }
+
+}

dough-items/src/main/java/io/github/bakedlibs/dough/items/nms/ItemNameAdapterPaper.java

@@ -0,0 +1,16 @@
+package io.github.bakedlibs.dough.items.nms;
+
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.inventory.ItemStack;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.lang.reflect.InvocationTargetException;
+
+public class ItemNameAdapterPaper implements ItemNameAdapter {
+    @Override
+    @ParametersAreNonnullByDefault
+    public String getName(ItemStack item) throws IllegalAccessException, InvocationTargetException {
+        return PlainTextComponentSerializer.plainText().serialize(Bukkit.getItemFactory().displayName(item));
+    }
+}