From ef4d5340a022bc0de45b7ab37372f18710171457 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Fri, 8 Sep 2023 01:45:58 +0800 Subject: [PATCH] 2.2.3.6 --- .../customnameplates/manager/BackgroundManager.java | 13 +++++++++++-- .../customnameplates/manager/FontManager.java | 2 ++ .../customnameplates/manager/ImageManager.java | 1 + .../object/actionbar/ActionBarSender.java | 1 - .../resources/contents/backgrounds/bedrock_1.yml | 2 ++ .../resources/contents/backgrounds/bedrock_2.yml | 2 ++ .../resources/contents/backgrounds/bedrock_3.yml | 2 ++ 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/momirealms/customnameplates/manager/BackgroundManager.java b/src/main/java/net/momirealms/customnameplates/manager/BackgroundManager.java index a2ade60..e4eb247 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/BackgroundManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/BackgroundManager.java @@ -86,8 +86,17 @@ public class BackgroundManager extends Function { offset_8, offset_16, offset_32, offset_64, offset_128, endChar, - config.getInt("left-margin", 1), config.getInt("right-margin", 1))) - ; + config.getInt("left-margin", 1), config.getInt("right-margin", 1))); + plugin.getFontManager().loadCustomWidth(o1, 1); + plugin.getFontManager().loadCustomWidth(o2, 2); + plugin.getFontManager().loadCustomWidth(o4, 4); + plugin.getFontManager().loadCustomWidth(o8, 8); + plugin.getFontManager().loadCustomWidth(o16, 16); + plugin.getFontManager().loadCustomWidth(o32, 32); + plugin.getFontManager().loadCustomWidth(o64, 64); + plugin.getFontManager().loadCustomWidth(o128, 128); + plugin.getFontManager().loadCustomWidth(oStart, config.getInt("left.width", 1)); + plugin.getFontManager().loadCustomWidth(oEnd, config.getInt("right.width", 1)); } AdventureUtils.consoleMessage("[CustomNameplates] Loaded " + backGroundConfigMap.size() + " backgrounds"); } diff --git a/src/main/java/net/momirealms/customnameplates/manager/FontManager.java b/src/main/java/net/momirealms/customnameplates/manager/FontManager.java index b9ccf78..f7356e0 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/FontManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/FontManager.java @@ -84,6 +84,8 @@ public class FontManager extends Function { customImageWidth.put(ASCIIWidth.values()[i].getCharacter(), ASCIIWidth.values()[i].getWidth()); for (SimpleChar simpleChar : plugin.getImageManager().getCharacterMap().values()) customImageWidth.put(simpleChar.getChars(), simpleChar.getWidth()); + for (OffsetFont offsetFont : OffsetFont.values()) + customImageWidth.put(offsetFont.getCharacter(), offsetFont.getSpace() - 1); YamlConfiguration config = ConfigUtils.getConfig("configs" + File.separator + "image-width.yml"); for (String image : config.getKeys(false)) { String character = AdventureUtils.stripAllTags(PlaceholderAPI.setPlaceholders(null, image)); diff --git a/src/main/java/net/momirealms/customnameplates/manager/ImageManager.java b/src/main/java/net/momirealms/customnameplates/manager/ImageManager.java index c79447a..58be1e5 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ImageManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ImageManager.java @@ -22,6 +22,7 @@ import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.object.SimpleChar; import net.momirealms.customnameplates.utils.AdventureUtils; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; import java.io.File; diff --git a/src/main/java/net/momirealms/customnameplates/object/actionbar/ActionBarSender.java b/src/main/java/net/momirealms/customnameplates/object/actionbar/ActionBarSender.java index af438d2..fc96c0c 100644 --- a/src/main/java/net/momirealms/customnameplates/object/actionbar/ActionBarSender.java +++ b/src/main/java/net/momirealms/customnameplates/object/actionbar/ActionBarSender.java @@ -45,7 +45,6 @@ public class ActionBarSender { } public boolean canSend() { - if (requirements.length == 0) return true; for (Requirement requirement : requirements) { if (!requirement.isConditionMet(player)) { return false; diff --git a/src/main/resources/contents/backgrounds/bedrock_1.yml b/src/main/resources/contents/backgrounds/bedrock_1.yml index 3b518ab..75a8212 100644 --- a/src/main/resources/contents/backgrounds/bedrock_1.yml +++ b/src/main/resources/contents/backgrounds/bedrock_1.yml @@ -5,11 +5,13 @@ left: image: b0 height: 14 ascent: 7 + width: 1 right: image: b0 height: 14 ascent: 7 + width: 1 middle: height: 14 diff --git a/src/main/resources/contents/backgrounds/bedrock_2.yml b/src/main/resources/contents/backgrounds/bedrock_2.yml index 0f1c57f..18943e6 100644 --- a/src/main/resources/contents/backgrounds/bedrock_2.yml +++ b/src/main/resources/contents/backgrounds/bedrock_2.yml @@ -5,11 +5,13 @@ left: image: b0 height: 14 ascent: 9 + width: 1 right: image: b0 height: 14 ascent: 9 + width: 1 middle: height: 14 diff --git a/src/main/resources/contents/backgrounds/bedrock_3.yml b/src/main/resources/contents/backgrounds/bedrock_3.yml index d147a2f..1492997 100644 --- a/src/main/resources/contents/backgrounds/bedrock_3.yml +++ b/src/main/resources/contents/backgrounds/bedrock_3.yml @@ -5,11 +5,13 @@ left: image: b0 height: 14 ascent: -7 + width: 1 right: image: b0 height: 14 ascent: -7 + width: 1 middle: height: 14