diff --git a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java index fe9b456..a750214 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextEntity.java @@ -24,7 +24,7 @@ import java.util.UUID; public interface StaticTextEntity { - String getPlugin(); + String getID(); boolean isShownTo(Player viewer); diff --git a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java index 60ee82a..6d92ee3 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/tag/unlimited/StaticTextTagSetting.java @@ -24,14 +24,14 @@ 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() { @@ -39,7 +39,7 @@ public class StaticTextTagSetting { comeRule = (player, entity) -> true; leaveRule = (player, entity) -> true; defaultText = ""; - plugin = ""; + id = ""; } public static Builder builder() { @@ -78,8 +78,8 @@ public class StaticTextTagSetting { 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 class StaticTextTagSetting { 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 index 474c23a..1551ffb 100644 --- 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() apply(plugin = "java") diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java index 5e27793..c790ed7 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/adventure/AdventureManagerImpl.java @@ -195,7 +195,7 @@ public class AdventureManagerImpl implements AdventureManager { case 'd' -> stringBuilder.append(""); case 'e' -> stringBuilder.append(""); case 'f' -> stringBuilder.append(""); - case 'r' -> stringBuilder.append(""); + case 'r' -> stringBuilder.append(""); case 'l' -> stringBuilder.append(""); case 'm' -> stringBuilder.append(""); case 'o' -> stringBuilder.append(""); diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java index c5cb2d1..914c552 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/bubble/BubbleManagerImpl.java @@ -365,11 +365,11 @@ public class BubbleManagerImpl implements BubbleManager, Listener { }) .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/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/StaticTextEntityImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/StaticTextEntityImpl.java index 5742c0d..e6dc34e 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/StaticTextEntityImpl.java +++ b/paper/src/main/java/net/momirealms/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 class StaticTextEntityImpl implements StaticTextEntity { NearbyRule comeRule, NearbyRule leaveRule, String defaultText, - String plugin + String id ) { this.entityId = FakeEntityUtils.getAndIncrease(); this.owner = owner; @@ -68,15 +68,15 @@ public class StaticTextEntityImpl implements StaticTextEntity { 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/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java index c4b4148..e5e2e0a 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/unlimited/UnlimitedTagManagerImpl.java @@ -118,7 +118,7 @@ public class UnlimitedTagManagerImpl implements UnlimitedTagManager { setting.getComeRule(), setting.getLeaveRule(), setting.getDefaultText(), - setting.getPlugin() + setting.getID() ); }