[Layout] Use randomly generated property names for fixes slots instea…

…d of building them deterministically
NEZNAMY · Sep 7, 2024 · 54a519d · 54a519d
1 parent 462d383
commit 54a519d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/shared/src/main/java/me/neznamy/tab/shared/features/layout/FixedSlot.java b/shared/src/main/java/me/neznamy/tab/shared/features/layout/FixedSlot.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.shared.Property;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.config.files.config.LayoutConfiguration.LayoutDefinition.FixedSlotDefinition;
@@ -20,16 +21,16 @@
 @RequiredArgsConstructor
 public class FixedSlot extends RefreshableFeature {
 
-    private static final StringToComponentCache cache = new StringToComponentCache("LayoutFixedSlot", 1000);
+    @NotNull private static final StringToComponentCache cache = new StringToComponentCache("LayoutFixedSlot", 1000);
 
+    @NotNull private final String propertyName = Property.randomName();
+    @NotNull private final String skinProperty = Property.randomName();
     @NonNull private final LayoutManagerImpl manager;
     @Getter private final int slot;
     @NonNull private final LayoutPattern pattern;
     @NonNull private final UUID id;
     @NonNull private final String text;
-    @NonNull private final String propertyName;
     @NonNull private final String skin;
-    @NonNull private final String skinProperty;
     private final int ping;
 
     @NotNull
@@ -97,9 +98,7 @@ public static FixedSlot fromDefinition(@NotNull FixedSlotDefinition def, @NotNul
                 pattern,
                 manager.getUUID(def.slot),
                 def.text,
-                "Layout-" + pattern.getName() + "-SLOT-" + def.slot,
                 def.skin == null || def.skin.isEmpty() ? manager.getConfiguration().getDefaultSkin(def.slot) : def.skin,
-                "Layout-" + pattern.getName() + "-SLOT-" + def.slot + "-skin",
                 def.ping == null ? manager.getConfiguration().emptySlotPing : def.ping
         );
         if (!def.text.isEmpty()) TAB.getInstance().getFeatureManager().registerFeature(TabConstants.Feature.layoutSlot(pattern.getName(), def.slot), f);

diff --git a/shared/src/main/java/me/neznamy/tab/shared/features/layout/LayoutPattern.java b/shared/src/main/java/me/neznamy/tab/shared/features/layout/LayoutPattern.java
@@ -88,8 +88,7 @@ public void addFixedSlot(int slot, @NonNull String text, int ping) {
     @Override
     public void addFixedSlot(int slot, @NonNull String text, @NonNull String skin, int ping) {
         ensureActive();
-        fixedSlots.put(slot, new FixedSlot(manager, slot, this, manager.getUUID(slot), text,
-                "Layout-" + name + "-SLOT-" + slot, skin, "Layout-" + name + "-SLOT-" + slot+ "-skin", ping));
+        fixedSlots.put(slot, new FixedSlot(manager, slot, this, manager.getUUID(slot), text, skin, ping));
     }
 
     @Override