Merge branch 'SlimefunGuguProject:dev' into dev

neokoni · web-flow · commit ccfa97704a0c · 2025-08-09T13:07:34.000+08:00
diff --git a/src/main/java/city/norain/slimefun4/compatibillty/CompatibilityUtil.java b/src/main/java/city/norain/slimefun4/compatibillty/CompatibilityUtil.java
@@ -0,0 +1,87 @@
+package city.norain.slimefun4.compatibillty;
+
+import city.norain.slimefun4.SlimefunExtended;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Registry;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.block.data.Ageable;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.WallSign;
+
+@UtilityClass
+public class CompatibilityUtil {
+    /**
+     * 获取玩家放置此方块所使用的物品材质。
+     * 对于大多数方块，这与 getMaterial() 相同，但有些方块有不同的材质用于放置它们。
+     * 注意：此处没有涵盖所有可能不同的方块数据类型。
+     *
+     * @param blockData
+     * @return 放置此方块所使用的材质
+     */
+    public Material getPlacementMaterial(BlockData blockData) {
+        if (SlimefunExtended.getMinecraftVersion().isAtLeast(1, 19, 4)) {
+            return blockData.getPlacementMaterial();
+        } else {
+            switch (blockData.getMaterial()) {
+                case PLAYER_WALL_HEAD -> {
+                    return Material.PLAYER_HEAD;
+                }
+                case REDSTONE_WIRE -> {
+                    return Material.REDSTONE;
+                }
+                default -> {
+                    var mat = blockData.getMaterial();
+                    var enumName = blockData.getMaterial().name();
+
+                    if (Ageable.class.equals(mat.data) && enumName.endsWith("S")) {
+                        var itemMat = Material.getMaterial(enumName.substring(0, enumName.length() - 1));
+                        return itemMat != null && itemMat.isItem() ? itemMat : mat;
+                    }
+
+                    if (WallSign.class.equals(mat.data) && enumName.contains("_WALL_")) {
+                        Material itemMat = Material.getMaterial(enumName.replace("_WALL_", "_"));
+
+                        if (itemMat != null && itemMat.isItem()) {
+                            return mat;
+                        }
+                    }
+
+                    // Fallback to original material
+                    return blockData.getMaterial();
+                }
+            }
+        }
+    }
+
+    /**
+     * 检查玩家是否处于连接状态。
+     * 在 1.20- 中不能保证玩家是否连接，仅返回在线状态。
+     *
+     * @param player 离线玩家
+     * @return 玩家连接或在线
+     */
+    public boolean isConnected(OfflinePlayer player) {
+        if (SlimefunExtended.getMinecraftVersion().isAtLeast(1, 20)) {
+            return player.isConnected();
+        } else {
+            return player.isOnline();
+        }
+    }
+
+    /**
+     * 获取最大生命值属性。
+     * 在 1.21.3 之前，使用 GENERIC_MAX_HEALTH。
+     *
+     * @return 最大生命值属性
+     */
+    public static Attribute getMaxHealth() {
+        if (SlimefunExtended.getMinecraftVersion().isAtLeast(1, 21, 3)) {
+            return Registry.ATTRIBUTE.get(NamespacedKey.fromString("max_health"));
+        } else {
+            return Attribute.valueOf("GENERIC_MAX_HEALTH");
+        }
+    }
+}
diff --git a/src/main/java/city/norain/slimefun4/compatibillty/VersionedAttribute.java b/src/main/java/city/norain/slimefun4/compatibillty/VersionedAttribute.java
diff --git a/src/main/java/city/norain/slimefun4/utils/InventoryUtil.java b/src/main/java/city/norain/slimefun4/utils/InventoryUtil.java
@@ -1,5 +1,6 @@
 package city.norain.slimefun4.utils;
 
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import io.github.thebusybiscuit.slimefun4.core.debug.Debug;
 import io.github.thebusybiscuit.slimefun4.core.debug.TestCase;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
@@ -19,7 +20,7 @@ public void openInventory(Player p, Inventory inventory) {
             return;
         }
 
-        if (!PlayerUtil.isConnected(p)) {
+        if (!CompatibilityUtil.isConnected(p)) {
             Debug.log(
                     TestCase.INVENTORY,
                     "Tried to open an inventory for a player that is not connected: " + p.getName());
diff --git a/src/main/java/city/norain/slimefun4/utils/PlayerUtil.java b/src/main/java/city/norain/slimefun4/utils/PlayerUtil.java
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/ProfileDataController.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/ProfileDataController.java
@@ -1,6 +1,6 @@
 package com.xzavier0722.mc.plugin.slimefun4.storage.controller;
 
-import city.norain.slimefun4.utils.PlayerUtil;
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback;
 import com.xzavier0722.mc.plugin.slimefun4.storage.common.DataScope;
 import com.xzavier0722.mc.plugin.slimefun4.storage.common.DataType;
@@ -356,7 +356,7 @@ public void run() {
                     return;
                 }
 
-                if (PlayerUtil.isConnected(Bukkit.getOfflinePlayer(UUID.fromString(pUuid)))) {
+                if (CompatibilityUtil.isConnected(Bukkit.getOfflinePlayer(UUID.fromString(pUuid)))) {
                     return;
                 }
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java
@@ -1,6 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.medical;
 
-import city.norain.slimefun4.compatibillty.VersionedAttribute;
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import io.github.bakedlibs.dough.items.ItemUtils;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
@@ -48,7 +48,7 @@ public ItemUseHandler getItemHandler() {
             // Player is neither burning nor injured
             if (p.getFireTicks() <= 0
                     && p.getHealth()
-                            >= p.getAttribute(VersionedAttribute.getMaxHealth()).getValue()) {
+                            >= p.getAttribute(CompatibilityUtil.getMaxHealth()).getValue()) {
                 return;
             }
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/MedicalSupply.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/MedicalSupply.java
@@ -1,6 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.medical;
 
-import city.norain.slimefun4.compatibillty.VersionedAttribute;
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
@@ -71,7 +71,7 @@ public void clearNegativeEffects(@Nonnull LivingEntity n) {
      */
     public void heal(@Nonnull LivingEntity n) {
         double health = n.getHealth() + healAmount;
-        double maxHealth = n.getAttribute(VersionedAttribute.getMaxHealth()).getValue();
+        double maxHealth = n.getAttribute(CompatibilityUtil.getMaxHealth()).getValue();
         n.setHealth(Math.min(health, maxHealth));
     }
 }
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java
@@ -1,6 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.medical;
 
-import city.norain.slimefun4.compatibillty.VersionedAttribute;
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import io.github.bakedlibs.dough.items.ItemUtils;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
@@ -36,7 +36,7 @@ public Splint(
             // Player is neither burning nor injured
             if (p.getFireTicks() <= 0
                     && p.getHealth()
-                            >= p.getAttribute(VersionedAttribute.getMaxHealth()).getValue()) {
+                            >= p.getAttribute(CompatibilityUtil.getMaxHealth()).getValue()) {
                 return;
             }
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/VampireBlade.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/VampireBlade.java
@@ -1,6 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.weapons;
 
-import city.norain.slimefun4.compatibillty.VersionedAttribute;
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
@@ -43,7 +43,7 @@ public VampireBlade(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci
                 SoundEffect.VAMPIRE_BLADE_HEALING_SOUND.playFor(p);
                 double health = p.getHealth() + HEALING_AMOUNT;
                 double maxHealth =
-                        p.getAttribute(VersionedAttribute.getMaxHealth()).getValue();
+                        p.getAttribute(CompatibilityUtil.getMaxHealth()).getValue();
                 p.setHealth(Math.min(health, maxHealth));
             }
         };
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
@@ -1,5 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.implementation.listeners;
 
+import city.norain.slimefun4.compatibillty.CompatibilityUtil;
 import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback;
 import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunBlockData;
 import com.xzavier0722.mc.plugin.slimefun4.storage.controller.attributes.UniversalBlock;
@@ -116,7 +117,8 @@ public void onBlockPlace(BlockPlaceEvent e) {
         if (sfItem != null && !(sfItem instanceof NotPlaceable)) {
             // Fixes #994, should check placed block is equals to item material or not.
             if (item.getType() != e.getBlock().getType()) {
-                if (item.getType() != e.getBlock().getBlockData().getPlacementMaterial()) {
+                if (item.getType()
+                        != CompatibilityUtil.getPlacementMaterial(e.getBlock().getBlockData())) {
                     return;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.xzavier0722.mc.plugin.slimefun4.storage.controller;`
`2`	`2`
`3`		`-import city.norain.slimefun4.utils.PlayerUtil;`
	`3`	`+import city.norain.slimefun4.compatibillty.CompatibilityUtil;`
`4`	`4`	`import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback;`
`5`	`5`	`import com.xzavier0722.mc.plugin.slimefun4.storage.common.DataScope;`
`6`	`6`	`import com.xzavier0722.mc.plugin.slimefun4.storage.common.DataType;`
`@@ -356,7 +356,7 @@ public void run() {`
`356`	`356`	`return;`
`357`	`357`	`}`
`358`	`358`
`359`		`- if (PlayerUtil.isConnected(Bukkit.getOfflinePlayer(UUID.fromString(pUuid)))) {`
	`359`	`+ if (CompatibilityUtil.isConnected(Bukkit.getOfflinePlayer(UUID.fromString(pUuid)))) {`
`360`	`360`	`return;`
`361`	`361`	`}`
`362`	`362`