merge: branch 'develop' into stable

Author: zetastormy

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.gradleup.shadow") version ("8.3.5")
-    id("io.papermc.paperweight.userdev") version ("1.7.7")
+    id("io.papermc.paperweight.userdev") version ("2.0.0-beta.8")
 }
 
 group = "team.devblook"

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-projectVersion=1.7.0
+projectVersion=1.7.1
 libsPackage=team.devblook.akropolis.libs

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -61,12 +61,16 @@ public PlayerHider(HotbarManager hotbarManager, ItemStack item, int slot, String
         ItemStack hiddenItem = ItemStackBuilder.getItemStack(config.getConfigurationSection("player_hider.hidden")).build();
         ItemStack notHiddenItem = ItemStackBuilder.getItemStack(config.getConfigurationSection("player_hider.not_hidden")).build();
 
-        ItemMeta playerHiderMeta = hiddenItem.getItemMeta();
-        PersistentDataContainer playerHiderContainer = playerHiderMeta.getPersistentDataContainer();
-        playerHiderContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
+        ItemMeta hiddenMeta = hiddenItem.getItemMeta();
+        PersistentDataContainer hiddenContainer = hiddenMeta.getPersistentDataContainer();
+        hiddenContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
 
-        hiddenItem.setItemMeta(playerHiderMeta);
-        notHiddenItem.setItemMeta(playerHiderMeta);
+        ItemMeta notHiddenMeta = notHiddenItem.getItemMeta();
+        PersistentDataContainer notHiddenContainer = notHiddenMeta.getPersistentDataContainer();
+        notHiddenContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
+
+        hiddenItem.setItemMeta(hiddenMeta);
+        notHiddenItem.setItemMeta(notHiddenMeta);
 
         this.hiddenItem = hiddenItem;
         this.notHiddenItem = notHiddenItem;

src/main/java/team/devblook/akropolis/module/modules/hotbar/items/PlayerHider.java

@@ -65,16 +65,16 @@ public void onEnable() {
 
         if (rawTopBlock == null) {
             getPlugin().getLogger().severe("Launchpad' top block is missing, using air item!");
-            XMaterial.matchXMaterial("AIR").ifPresent(m -> topBlock = m.parseMaterial());
+            XMaterial.matchXMaterial("AIR").ifPresent(m -> topBlock = m.get());
         } else {
-            XMaterial.matchXMaterial(rawTopBlock).ifPresent(m -> topBlock = m.parseMaterial());
+            XMaterial.matchXMaterial(rawTopBlock).ifPresent(m -> topBlock = m.get());
         }
 
         if (rawBottomBlock == null) {
             getPlugin().getLogger().severe("Launchpad' bottom block is missing, using air item!");
-            XMaterial.matchXMaterial("AIR").ifPresent(m -> bottomBlock = m.parseMaterial());
+            XMaterial.matchXMaterial("AIR").ifPresent(m -> bottomBlock = m.get());
         } else {
-            XMaterial.matchXMaterial(rawBottomBlock).ifPresent(m -> bottomBlock = m.parseMaterial());
+            XMaterial.matchXMaterial(rawBottomBlock).ifPresent(m -> bottomBlock = m.get());
         }
     }
 

src/main/java/team/devblook/akropolis/module/modules/world/Launchpad.java

@@ -155,7 +155,7 @@ public static ItemStack parseMaterial(ConfigurationSection section) {
 
         ItemStack item = xmaterial.get().parseItem();
 
-        if (item != null && item.getType() == XMaterial.PLAYER_HEAD.parseMaterial()) {
+        if (item != null && item.getType() == XMaterial.PLAYER_HEAD.get()) {
             if (section.contains("base64")) {
                 item = ((HeadHook) PLUGIN.getHookManager().getPluginHook("BASE64"))
                         .getHead(section.getString("base64"));