From 508fbc988dc27e5f0748a28f9377d76ee1441232 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Thu, 9 Oct 2025 21:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ditem=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=A1=AB=E5=8E=9F=E7=89=88=E7=89=A9=E5=93=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/plugin/network/BukkitNetworkManager.java | 2 +-
 common-files/src/main/resources/config.yml                      | 1 +
 .../momirealms/craftengine/core/block/AbstractBlockManager.java | 2 +-
 .../momirealms/craftengine/core/block/BlockStateAppearance.java | 1 +
 .../momirealms/craftengine/core/font/AbstractFontManager.java   | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
index b35184958..75b1557a7 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
@@ -1247,7 +1247,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes
     }
 
     private static void pickItem(Player player, Key itemId, @Nullable Object blockPos, @Nullable Object entity) throws Throwable {
-        ItemStack itemStack = BukkitCraftEngine.instance().itemManager().buildCustomItemStack(itemId, BukkitCraftEngine.instance().adapt(player));
+        ItemStack itemStack = BukkitCraftEngine.instance().itemManager().buildItemStack(itemId, BukkitCraftEngine.instance().adapt(player));
         if (itemStack == null) {
             CraftEngine.instance().logger().warn("Item: " + itemId + " is not a valid item");
             return;
diff --git a/common-files/src/main/resources/config.yml b/common-files/src/main/resources/config.yml
index 16ad6dbe5..b709f022b 100644
--- a/common-files/src/main/resources/config.yml
+++ b/common-files/src/main/resources/config.yml
@@ -272,6 +272,7 @@ image:
   # - Must match the font defined in resource packs
   # - Do NOT modify unless you understand text rendering mechanics
   offset-characters:
+    enable: true
     font: minecraft:default
     -1: '\uf800'
     -2: '\uf801'
diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
index 510e7ce6c..f39da7dd4 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
@@ -150,7 +150,7 @@ public abstract class AbstractBlockManager extends AbstractModelGenerator implem
 
     @Override
     public boolean isTransparentModelInUse() {
-        return isTransparentModelInUse;
+        return this.isTransparentModelInUse;
     }
 
     @Override
diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/BlockStateAppearance.java b/core/src/main/java/net/momirealms/craftengine/core/block/BlockStateAppearance.java
index 75e39df37..fbd90c108 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/block/BlockStateAppearance.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/block/BlockStateAppearance.java
@@ -2,6 +2,7 @@ package net.momirealms.craftengine.core.block;
 
 import net.momirealms.craftengine.core.block.entity.render.element.BlockEntityElement;
 import net.momirealms.craftengine.core.block.entity.render.element.BlockEntityElementConfig;
+import net.momirealms.craftengine.core.util.Key;
 
 import java.util.Optional;
 
diff --git a/core/src/main/java/net/momirealms/craftengine/core/font/AbstractFontManager.java b/core/src/main/java/net/momirealms/craftengine/core/font/AbstractFontManager.java
index 639076b6c..5d81586e5 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/font/AbstractFontManager.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/font/AbstractFontManager.java
@@ -70,6 +70,7 @@ public abstract class AbstractFontManager implements FontManager {
     @Override
     public void load() {
         this.offsetFont = Optional.ofNullable(plugin.config().settings().getSection("image.offset-characters"))
+                .filter(section -> section.getBoolean("enable", true))
                 .map(OffsetFont::new)
                 .orElse(null);
         this.networkTagMapper = new HashMap<>(1024);
@@ -139,6 +140,7 @@ public abstract class AbstractFontManager implements FontManager {
     }
 
     private void registerShiftTags() {
+        if (this.offsetFont == null) return;
         for (int i = -256; i <= 256; i++) {
             String shiftTag = "<shift:" + i + ">";
             this.networkTagMapper.put(shiftTag, ComponentProvider.constant(this.offsetFont.createOffset(i)));