From 08eebba982833658d856a094771f4c355389cfa2 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 12 Apr 2025 22:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9fontmanger()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compatibility/papi/ImageExpansion.java | 2 +- .../compatibility/papi/ShiftExpansion.java | 8 +- .../plugin/network/PacketConsumers.java | 80 +++++++++---------- .../plugin/network/id/PacketIds1_20.java | 1 - .../plugin/network/id/PacketIds1_20_5.java | 1 - .../core/pack/AbstractPackManager.java | 2 +- .../craftengine/core/plugin/CraftEngine.java | 2 +- .../craftengine/core/plugin/Plugin.java | 2 +- .../plugin/text/minimessage/ImageTag.java | 2 +- .../plugin/text/minimessage/ShiftTag.java | 2 +- 10 files changed, 50 insertions(+), 52 deletions(-) diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java index 4f527f7af..c6ac983c1 100644 --- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java @@ -51,7 +51,7 @@ public class ImageExpansion extends PlaceholderExpansion { plugin.logger().warn("Invalid image namespaced key: " + param[0] + ":" + param[1]); return null; } - Optional optional = plugin.imageManager().bitmapImageByImageId(key); + Optional optional = plugin.fontManager().bitmapImageByImageId(key); if (optional.isEmpty()) { return null; } diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java index ea10750f9..10f165435 100644 --- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java @@ -40,7 +40,7 @@ public class ShiftExpansion extends PlaceholderExpansion { case "mini", "minimessage", "mm" -> { if (split.length != 2) return null; try { - return plugin.imageManager().createMiniMessageOffsets(Integer.parseInt(split[1])); + return plugin.fontManager().createMiniMessageOffsets(Integer.parseInt(split[1])); } catch (NumberFormatException e) { return null; } @@ -48,7 +48,7 @@ public class ShiftExpansion extends PlaceholderExpansion { case "md", "minedown" -> { if (split.length != 2) return null; try { - return plugin.imageManager().createMineDownOffsets(Integer.parseInt(split[1])); + return plugin.fontManager().createMineDownOffsets(Integer.parseInt(split[1])); } catch (NumberFormatException e) { return null; } @@ -56,7 +56,7 @@ public class ShiftExpansion extends PlaceholderExpansion { case "raw" -> { if (split.length != 2) return null; try { - return plugin.imageManager().createRawOffsets(Integer.parseInt(split[1])); + return plugin.fontManager().createRawOffsets(Integer.parseInt(split[1])); } catch (NumberFormatException e) { return null; } @@ -64,7 +64,7 @@ public class ShiftExpansion extends PlaceholderExpansion { default -> { if (split.length != 1) return null; try { - return plugin.imageManager().createMiniMessageOffsets(Integer.parseInt(split[0])); + return plugin.fontManager().createMiniMessageOffsets(Integer.parseInt(split[0])); } catch (NumberFormatException e) { return null; } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java index 252144ad5..052bab0d8 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java @@ -261,9 +261,9 @@ public class PacketConsumers { Tag suffix = buf.readNbt(false); if (suffix == null) return; - Map tokens1 = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); - Map tokens2 = CraftEngine.instance().imageManager().matchTags(prefix.getAsString()); - Map tokens3 = CraftEngine.instance().imageManager().matchTags(suffix.getAsString()); + Map tokens1 = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); + Map tokens2 = CraftEngine.instance().fontManager().matchTags(prefix.getAsString()); + Map tokens3 = CraftEngine.instance().fontManager().matchTags(suffix.getAsString()); if (tokens1.isEmpty() && tokens2.isEmpty() && tokens3.isEmpty()) return; event.setChanged(true); @@ -349,7 +349,7 @@ public class PacketConsumers { continue; } String json = ComponentUtils.minecraftToJson(mcComponent); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) { newEntries.add(entry); continue; @@ -387,9 +387,9 @@ public class PacketConsumers { String prefix = buf.readUtf(); String suffix = buf.readUtf(); - Map tokens1 = CraftEngine.instance().imageManager().matchTags(displayName); - Map tokens2 = CraftEngine.instance().imageManager().matchTags(prefix); - Map tokens3 = CraftEngine.instance().imageManager().matchTags(suffix); + Map tokens1 = CraftEngine.instance().fontManager().matchTags(displayName); + Map tokens2 = CraftEngine.instance().fontManager().matchTags(prefix); + Map tokens3 = CraftEngine.instance().fontManager().matchTags(suffix); if (tokens1.isEmpty() && tokens2.isEmpty() && tokens3.isEmpty()) return; event.setChanged(true); @@ -456,7 +456,7 @@ public class PacketConsumers { int actionType = buf.readVarInt(); if (actionType == 0) { String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; Component component = AdventureHelper.jsonToComponent(json); for (Map.Entry token : tokens.entrySet()) { @@ -478,7 +478,7 @@ public class PacketConsumers { buf.writeByte(flag); } else if (actionType == 3) { String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(json); @@ -505,7 +505,7 @@ public class PacketConsumers { if (actionType == 0) { Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; Component component = AdventureHelper.tagToComponent(nbt); for (Map.Entry token : tokens.entrySet()) { @@ -528,7 +528,7 @@ public class PacketConsumers { } else if (actionType == 3) { Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(nbt); @@ -555,7 +555,7 @@ public class PacketConsumers { if (mode != 0 && mode != 2) return; String displayName = buf.readUtf(); int renderType = buf.readVarInt(); - Map tokens = CraftEngine.instance().imageManager().matchTags(displayName); + Map tokens = CraftEngine.instance().fontManager().matchTags(displayName); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(displayName); @@ -587,7 +587,7 @@ public class PacketConsumers { if (optionalNumberFormat) { int format = buf.readVarInt(); if (format == 0) { - Map tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(displayName); @@ -603,7 +603,7 @@ public class PacketConsumers { buf.writeBoolean(true); buf.writeVarInt(0); } else if (format == 1) { - Map tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); if (tokens.isEmpty()) return; Tag style = buf.readNbt(false); event.setChanged(true); @@ -623,8 +623,8 @@ public class PacketConsumers { } else if (format == 2) { Tag fixed = buf.readNbt(false); if (fixed == null) return; - Map tokens1 = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); - Map tokens2 = CraftEngine.instance().imageManager().matchTags(fixed.getAsString()); + Map tokens1 = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); + Map tokens2 = CraftEngine.instance().fontManager().matchTags(fixed.getAsString()); if (tokens1.isEmpty() && tokens2.isEmpty()) return; event.setChanged(true); buf.clear(); @@ -654,7 +654,7 @@ public class PacketConsumers { } } } else { - Map tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(displayName); @@ -679,7 +679,7 @@ public class PacketConsumers { try { FriendlyByteBuf buf = event.getBuffer(); String jsonOrPlainString = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(jsonOrPlainString); + Map tokens = CraftEngine.instance().fontManager().matchTags(jsonOrPlainString); if (tokens.isEmpty()) return; boolean overlay = buf.readBoolean(); event.setChanged(true); @@ -702,7 +702,7 @@ public class PacketConsumers { FriendlyByteBuf buf = event.getBuffer(); Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; boolean overlay = buf.readBoolean(); event.setChanged(true); @@ -724,7 +724,7 @@ public class PacketConsumers { try { FriendlyByteBuf buf = event.getBuffer(); String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(json); @@ -745,7 +745,7 @@ public class PacketConsumers { FriendlyByteBuf buf = event.getBuffer(); Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(nbt); @@ -765,7 +765,7 @@ public class PacketConsumers { try { FriendlyByteBuf buf = event.getBuffer(); String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(json); @@ -786,7 +786,7 @@ public class PacketConsumers { FriendlyByteBuf buf = event.getBuffer(); Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(nbt); @@ -806,7 +806,7 @@ public class PacketConsumers { try { FriendlyByteBuf buf = event.getBuffer(); String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(json); @@ -827,7 +827,7 @@ public class PacketConsumers { FriendlyByteBuf buf = event.getBuffer(); Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.tagToComponent(nbt); @@ -848,8 +848,8 @@ public class PacketConsumers { FriendlyByteBuf buf = event.getBuffer(); String json1 = buf.readUtf(); String json2 = buf.readUtf(); - Map tokens1 = CraftEngine.instance().imageManager().matchTags(json1); - Map tokens2 = CraftEngine.instance().imageManager().matchTags(json2); + Map tokens1 = CraftEngine.instance().fontManager().matchTags(json1); + Map tokens2 = CraftEngine.instance().fontManager().matchTags(json2); if (tokens1.isEmpty() && tokens2.isEmpty()) return; event.setChanged(true); buf.clear(); @@ -885,8 +885,8 @@ public class PacketConsumers { if (nbt1 == null) return; Tag nbt2 = buf.readNbt(false); if (nbt2 == null) return; - Map tokens1 = CraftEngine.instance().imageManager().matchTags(nbt1.getAsString()); - Map tokens2 = CraftEngine.instance().imageManager().matchTags(nbt2.getAsString()); + Map tokens1 = CraftEngine.instance().fontManager().matchTags(nbt1.getAsString()); + Map tokens2 = CraftEngine.instance().fontManager().matchTags(nbt2.getAsString()); if (tokens1.isEmpty() && tokens2.isEmpty()) return; event.setChanged(true); buf.clear(); @@ -921,7 +921,7 @@ public class PacketConsumers { int containerId = buf.readVarInt(); int type = buf.readVarInt(); String json = buf.readUtf(); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (tokens.isEmpty()) return; event.setChanged(true); Component component = AdventureHelper.jsonToComponent(json); @@ -946,7 +946,7 @@ public class PacketConsumers { int type = buf.readVarInt(); Tag nbt = buf.readNbt(false); if (nbt == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(nbt.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(nbt.getAsString()); if (tokens.isEmpty()) return; Component component = AdventureHelper.tagToComponent(nbt); for (Map.Entry token : tokens.entrySet()) { @@ -1695,7 +1695,7 @@ public class PacketConsumers { String message = (String) Reflections.field$ServerboundRenameItemPacket$name.get(packet); if (message != null && !message.isEmpty()) { // check bypass - FontManager manager = CraftEngine.instance().imageManager(); + FontManager manager = CraftEngine.instance().fontManager(); IllegalCharacterProcessResult result = manager.processIllegalCharacters(message); if (result.has()) { try { @@ -1719,7 +1719,7 @@ public class PacketConsumers { return; } String[] lines = (String[]) Reflections.field$ServerboundSignUpdatePacket$lines.get(packet); - FontManager manager = CraftEngine.instance().imageManager(); + FontManager manager = CraftEngine.instance().fontManager(); if (!manager.isDefaultFontInUse()) return; for (int i = 0; i < lines.length; i++) { String line = lines[i]; @@ -1740,7 +1740,7 @@ public class PacketConsumers { public static final TriConsumer EDIT_BOOK = (user, event, packet) -> { try { if (!Config.filterBook()) return; - FontManager manager = CraftEngine.instance().imageManager(); + FontManager manager = CraftEngine.instance().fontManager(); if (!manager.isDefaultFontInUse()) return; // check bypass if (((BukkitServerPlayer) user).hasPermission(FontManager.BYPASS_BOOK)) { @@ -1882,7 +1882,7 @@ public class PacketConsumers { if (optionalTextComponent.isPresent()) { Object textComponent = optionalTextComponent.get(); String json = ComponentUtils.minecraftToJson(textComponent); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (!tokens.isEmpty()) { Component component = AdventureHelper.jsonToComponent(json); for (Map.Entry token : tokens.entrySet()) { @@ -1915,7 +1915,7 @@ public class PacketConsumers { Object textComponent = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$value(packedItem); if (textComponent == Reflections.instance$Component$empty) break; String json = ComponentUtils.minecraftToJson(textComponent); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (!tokens.isEmpty()) { Component component = AdventureHelper.jsonToComponent(json); for (Map.Entry token : tokens.entrySet()) { @@ -1948,7 +1948,7 @@ public class PacketConsumers { if (optionalTextComponent.isPresent()) { Object textComponent = optionalTextComponent.get(); String json = ComponentUtils.minecraftToJson(textComponent); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (!tokens.isEmpty()) { Component component = AdventureHelper.jsonToComponent(json); for (Map.Entry token : tokens.entrySet()) { @@ -1981,7 +1981,7 @@ public class PacketConsumers { if (optionalTextComponent.isPresent()) { Object textComponent = optionalTextComponent.get(); String json = ComponentUtils.minecraftToJson(textComponent); - Map tokens = CraftEngine.instance().imageManager().matchTags(json); + Map tokens = CraftEngine.instance().fontManager().matchTags(json); if (!tokens.isEmpty()) { Component component = AdventureHelper.jsonToComponent(json); for (Map.Entry token : tokens.entrySet()) { @@ -2022,7 +2022,7 @@ public class PacketConsumers { displayName = buf.readNbt(false); } outside : if (displayName != null) { - Map tokens = CraftEngine.instance().imageManager().matchTags(displayName.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(displayName.getAsString()); if (tokens.isEmpty()) break outside; Component component = AdventureHelper.tagToComponent(displayName); for (Map.Entry token : tokens.entrySet()) { @@ -2045,7 +2045,7 @@ public class PacketConsumers { } else if (format == 2) { fixed = buf.readNbt(false); if (fixed == null) return; - Map tokens = CraftEngine.instance().imageManager().matchTags(fixed.getAsString()); + Map tokens = CraftEngine.instance().fontManager().matchTags(fixed.getAsString()); if (tokens.isEmpty() && !isChanged) return; if (!tokens.isEmpty()) { Component component = AdventureHelper.tagToComponent(fixed); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20.java index 08c4fab48..a1c2c9831 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20.java @@ -2,7 +2,6 @@ package net.momirealms.craftengine.bukkit.plugin.network.id; import net.momirealms.craftengine.bukkit.plugin.network.PacketIds; import net.momirealms.craftengine.bukkit.util.Reflections; -import net.momirealms.craftengine.core.util.VersionHelper; public class PacketIds1_20 implements PacketIds { diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20_5.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20_5.java index cc5a611fb..ea3437281 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20_5.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/id/PacketIds1_20_5.java @@ -1,7 +1,6 @@ package net.momirealms.craftengine.bukkit.plugin.network.id; import net.momirealms.craftengine.bukkit.plugin.network.PacketIds; -import net.momirealms.craftengine.bukkit.util.Reflections; public class PacketIds1_20_5 implements PacketIds { diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java index 09eceac63..24d1cda5a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java @@ -1072,7 +1072,7 @@ public abstract class AbstractPackManager implements PackManager { private void generateFonts(Path generatedPackPath) { // generate image font json - for (Font font : plugin.imageManager().fonts()) { + for (Font font : plugin.fontManager().fonts()) { Key namespacedKey = font.key(); Path fontPath = generatedPackPath.resolve("assets") .resolve(namespacedKey.namespace()) diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 6634f8462..4c9540d7a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -344,7 +344,7 @@ public abstract class CraftEngine implements Plugin { } @Override - public FontManager imageManager() { + public FontManager fontManager() { return fontManager; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/Plugin.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/Plugin.java index d34729e3d..b7022151b 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/Plugin.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/Plugin.java @@ -57,7 +57,7 @@ public interface Plugin { NetworkManager networkManager(); - FontManager imageManager(); + FontManager fontManager(); Config config(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ImageTag.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ImageTag.java index 4e726e415..a6d718aea 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ImageTag.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ImageTag.java @@ -29,7 +29,7 @@ public class ImageTag implements TagResolver { } String namespace = arguments.popOr("No argument namespace provided").toString(); String id = arguments.popOr("No argument id provided").toString(); - Optional optional = CraftEngine.instance().imageManager().bitmapImageByImageId(Key.of(namespace, id)); + Optional optional = CraftEngine.instance().fontManager().bitmapImageByImageId(Key.of(namespace, id)); if (optional.isPresent()) { if (arguments.hasNext()) { int row = arguments.popOr("No argument row provided").asInt().orElseThrow(() -> ctx.newException("Invalid argument number", arguments)); diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ShiftTag.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ShiftTag.java index dc27e9ff0..e5ccf26ae 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ShiftTag.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/ShiftTag.java @@ -25,7 +25,7 @@ public class ShiftTag implements TagResolver { String shiftAmount = arguments.popOr("No argument shift provided").toString(); try { int shift = Integer.parseInt(shiftAmount); - return Tag.inserting(AdventureHelper.miniMessage().deserialize(CraftEngine.instance().imageManager().createMiniMessageOffsets(shift))); + return Tag.inserting(AdventureHelper.miniMessage().deserialize(CraftEngine.instance().fontManager().createMiniMessageOffsets(shift))); } catch (NumberFormatException e) { throw ctx.newException("Invalid shift value", arguments); }