2.3.3.7

修复旧版颜色相关问题
Xiao-MoMi · Apr 6, 2024 · 8fb4b83 · 8fb4b83
1 parent e68a333
commit 8fb4b83
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/...ain/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java b/...ain/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java
@@ -24,7 +24,7 @@
 
 public interface StaticTextEntity {
 
-    String getPlugin();
+    String getID();
 
     boolean isShownTo(Player viewer);
 

diff --git a/...java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java b/...java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java
@@ -24,22 +24,22 @@ public class StaticTextTagSetting {
     private NearbyRule comeRule;
     private NearbyRule leaveRule;
     private String defaultText;
-    private String plugin;
+    private String id;
 
-    public StaticTextTagSetting(double verticalOffset, NearbyRule comeRule, NearbyRule leaveRule, String defaultText, String plugin) {
+    public StaticTextTagSetting(double verticalOffset, NearbyRule comeRule, NearbyRule leaveRule, String defaultText, String id) {
         this.verticalOffset = verticalOffset;
         this.comeRule = comeRule;
         this.leaveRule = leaveRule;
         this.defaultText = defaultText;
-        this.plugin = plugin;
+        this.id = id;
     }
 
     private StaticTextTagSetting() {
         verticalOffset = 0;
         comeRule = (player, entity) -> true;
         leaveRule = (player, entity) -> true;
         defaultText = "";
-        plugin = "";
+        id = "";
     }
 
     public static Builder builder() {
@@ -78,8 +78,8 @@ public Builder defaultText(String defaultText) {
             return this;
         }
 
-        public Builder plugin(String type) {
-            this.setting.plugin = type;
+        public Builder id(String id) {
+            this.setting.id = id;
             return this;
         }
 
@@ -100,8 +100,8 @@ public String getDefaultText() {
         return defaultText;
     }
 
-    public String getPlugin() {
-        return plugin;
+    public String getID() {
+        return id;
     }
 
     public NearbyRule getLeaveRule() {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
 
-    version = "2.3.3.6"
+    version = "2.3.3.7"
 
     apply<JavaPlugin>()
     apply(plugin = "java")

diff --git a/...r/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java b/...r/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java
@@ -195,7 +195,7 @@ public String legacyToMiniMessage(String legacy) {
                 case 'd' -> stringBuilder.append("<light_purple>");
                 case 'e' -> stringBuilder.append("<yellow>");
                 case 'f' -> stringBuilder.append("<white>");
-                case 'r' -> stringBuilder.append("<r><!i>");
+                case 'r' -> stringBuilder.append("<reset>");
                 case 'l' -> stringBuilder.append("<b>");
                 case 'm' -> stringBuilder.append("<st>");
                 case 'o' -> stringBuilder.append("<i>");

diff --git a/...rc/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java b/...rc/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java
@@ -365,11 +365,11 @@ private void sendBubble(Player player, String text, Bubble bubbleConfig, String
                 })
                 .verticalOffset(yOffset)
                 .defaultText(text)
-                .plugin("bubble")
+                .id("bubble")
                 .build());
 
         for (StaticTextEntity bubble : tagEntity.getStaticTags()) {
-            if (bubble.getPlugin().equals("bubble")) {
+            if (bubble.getID().equals("bubble")) {
                 bubble.setOffset(bubble.getOffset() + lineSpace);
             }
         }

diff --git a/...irealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/StaticTextEntityImpl.java b/...irealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/StaticTextEntityImpl.java
@@ -49,7 +49,7 @@ public class StaticTextEntityImpl implements StaticTextEntity {
     private final NearbyRule comeRule;
     private final NearbyRule leaveRule;
     private String defaultText;
-    private final String plugin;
+    private final String id;
     private final PacketContainer destroyPacket;
 
     public StaticTextEntityImpl (
@@ -58,7 +58,7 @@ public StaticTextEntityImpl (
             NearbyRule comeRule,
             NearbyRule leaveRule,
             String defaultText,
-            String plugin
+            String id
     ) {
         this.entityId = FakeEntityUtils.getAndIncrease();
         this.owner = owner;
@@ -68,15 +68,15 @@ public StaticTextEntityImpl (
         this.comeRule = comeRule;
         this.leaveRule = leaveRule;
         this.defaultText = defaultText;
-        this.plugin = plugin;
+        this.id = id;
         this.destroyPacket = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
         this.destroyPacket.getIntLists().write(0, List.of(entityId));
         this.viewersToArray();
     }
 
     @Override
-    public String getPlugin() {
-        return plugin;
+    public String getID() {
+        return id;
     }
 
     @Override

diff --git a/...alms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java b/...alms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java
@@ -118,7 +118,7 @@ public StaticTextEntity createNamedEntity(EntityTagEntity entity, StaticTextTagS
                 setting.getComeRule(),
                 setting.getLeaveRule(),
                 setting.getDefaultText(),
-                setting.getPlugin()
+                setting.getID()
         );
     }