Merge remote-tracking branch 'origin/v1.x.x' into v1.x.x

.github/workflows/gradle.yml

@@ -26,7 +26,7 @@ jobs:
       contents: write
 
     env:
-      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x", "1.21.x", "26.1.x"]'
+      MODRINTH_VERSIONS: '["1.18.x", "1.19.x", "1.20.x", "1.21.x", "26.1.x", "26.2.x"]'
       MODRINTH_PLATFORMS: '["spigot", "paper", "purpur", "folia"]'
 
     steps:

COMPATIBILITY.md

@@ -13,7 +13,8 @@ These plugins have compatibility handled by custom anvil. seek help on custom an
 
 #### Enchantment Plugins
 - [ExcellentEnchants](https://www.spigotmc.org/resources/excellentenchants-%E2%AD%90-75-vanilla-like-enchantments.61693/) by NightExpress:
-  Use ExcellentEnchants item type
+  Use ExcellentEnchants item type \
+  Also use ExcellentEnchant max enchant limit
 
 - [EcoEnchant](https://www.spigotmc.org/resources/ecoenchants-%E2%AD%95-250-enchantments-%E2%9C%85-create-custom-enchants-%E2%9C%A8-essentials-cmi-support.79573/) by Auxilor:
   Need to use /anvilconfigreload or a server restart to add newly added enchantment.

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "xyz.alexcrea"
-version = "1.17.3"
+version = "1.17.5"
 
 val isDevBuild = System.getenv("SMALL_COMMIT_HASH") != null
 val isPreRelease = System.getenv("IS_GITHUB_PRERELEASE") == "true"

gradle.properties

@@ -9,5 +9,5 @@ kotlin.daemon.jvmargs=-Xmx8G
 subprojects.reobfnms=v1_17R1,v1_18R1,v1_18R2,v1_19R1,v1_19R2,v1_19R3,v1_20R1,v1_20R2,v1_20R3,v1_20R4,v1_21R1,v1_21R2,v1_21R3,v1_21R4,v1_21R5,v1_21R6,v1_21R7
 
 # list of version for hangar release
-paperVersion=1.18-26.1.2
+paperVersion=1.18-26.2
 

impl/ExcellentEnchant5_4/build.gradle.kts

@@ -12,6 +12,6 @@ repositories {
 
 dependencies {
     // Excellent Enchant
-    compileOnly("su.nightexpress.excellentenchants:Core:5.4.1")
-    compileOnly("su.nightexpress.nightcore:main:2.14.1")
+    compileOnly("su.nightexpress.excellentenchants:Core:5.4.3")
+    compileOnly("su.nightexpress.nightcore:main:2.16.2")
 }

nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/PaperPacketManager.kt

@@ -24,8 +24,8 @@ class PaperPacketManager : PacketManagerBase(), PacketManager {
             sendedAbilities.mayfly = playerAbilities.mayfly
             sendedAbilities.instabuild = instantBuild
             sendedAbilities.mayBuild = playerAbilities.mayBuild
-            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
-            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
+            sendedAbilities.setFlyingSpeed(playerAbilities.getFlyingSpeed())
+            sendedAbilities.setWalkingSpeed(playerAbilities.getWalkingSpeed())
         }
         val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
         nmsPlayer.connection.send(packet)

src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CASuperEnchantEnchantment.java

@@ -5,6 +5,7 @@ import com.maddoxh.superEnchants.enchants.EnchantManager;
 import com.maddoxh.superEnchants.items.EnchantApplicator;
 import com.maddoxh.superEnchants.items.EnchantReader;
 import com.maddoxh.superEnchants.util.ConflictChecker;
+import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -68,6 +69,8 @@ public class CASuperEnchantEnchantment extends CAEnchantmentBase implements Addi
 
     @Override
     public boolean isItemConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull NamespacedKey itemType, @NotNull ItemStack item) {
+        if(Material.ENCHANTED_BOOK.equals(item.getType())) return false;
+
         return !enchant.canApplyTo(item.getType());
     }
 }