🐛 Fix background not initially working if set to transparent #4

Matt-MX · Sep 20, 2024 · ab83d46 · ab83d46
1 parent 44ff6d2
commit ab83d46
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/com/mattmx/nametags/NameTags.java b/src/main/java/com/mattmx/nametags/NameTags.java
@@ -39,8 +39,8 @@ public void onEnable() {
 
         SpigotEntityLibPlatform platform = new SpigotEntityLibPlatform(this);
         APIConfig settings = new APIConfig(PacketEvents.getAPI())
-            .tickTickables()
-            .trackPlatformEntities()
+//            .tickTickables()
+//            .trackPlatformEntities()
             .usePlatformLogger();
 
         EntityLib.init(platform, settings);
@@ -88,9 +88,6 @@ public HashMap<String, ConfigurationSection> getGroups() {
     }
 
     public static @NotNull NameTags getInstance() {
-        if (instance == null)
-            throw new RuntimeException("NameTags plugin has not initialized yet! Did you forget to depend?");
-
-        return instance;
+        return Objects.requireNonNull(instance, "NameTags plugin has not initialized yet! Did you forget to depend?");
     }
 }
diff --git a/src/main/java/com/mattmx/nametags/config/ConfigDefaultsListener.java b/src/main/java/com/mattmx/nametags/config/ConfigDefaultsListener.java
@@ -17,7 +17,10 @@ public ConfigDefaultsListener(@NotNull NameTags plugin) {
 
         NameTags.getInstance()
             .getEntityManager()
-            .setDefaultProvider(((entity, meta) -> TextDisplayMetaConfiguration.applyMeta(defaultSection(), meta)));
+            .setDefaultProvider(((entity, meta) -> {
+                meta.setUseDefaultBackground(false);
+                TextDisplayMetaConfiguration.applyMeta(defaultSection(), meta);
+            }));
     }
 
     private ConfigurationSection defaultSection() {

diff --git a/src/main/java/com/mattmx/nametags/config/TextDisplayMetaConfiguration.java b/src/main/java/com/mattmx/nametags/config/TextDisplayMetaConfiguration.java
@@ -49,9 +49,7 @@ public static void applyMeta(@NotNull ConfigurationSection section, @NotNull Tex
                 background = NameTags.TRANSPARENT;
             }
 
-            if (background != to.getBackgroundColor()) {
-                to.setBackgroundColor(background);
-            }
+            to.setBackgroundColor(background);
         }
 
         String billboardString = section.getString("billboard");

diff --git a/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java b/src/main/java/com/mattmx/nametags/entity/NameTagEntityManager.java
@@ -1,6 +1,7 @@
 package com.mattmx.nametags.entity;
 
 import com.github.retrooper.packetevents.util.Vector3f;
+import com.mattmx.nametags.NameTags;
 import com.mattmx.nametags.event.NameTagEntityCreateEvent;
 import me.tofaa.entitylib.meta.display.AbstractDisplayMeta;
 import me.tofaa.entitylib.meta.display.TextDisplayMeta;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -9,6 +9,7 @@ depend:
 
 softdepend:
   - PlaceholderAPI
+  - TAB
 
 commands:
   nametags-reload: