Add back option to disable tab expansion

NEZNAMY · Dec 22, 2023 · 6f49808 · 6f49808
1 parent 8e27cba
commit 6f49808
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/shared/src/main/java/me/neznamy/tab/shared/config/Converter.java b/shared/src/main/java/me/neznamy/tab/shared/config/Converter.java
@@ -424,10 +424,9 @@ public void convert332to400(@NotNull ConfigurationFile config) throws IOExceptio
     }
 
     public void convert403to404(@NotNull ConfigurationFile config) {
-        if (config.removeOption("placeholders.register-tab-expansion")) {
+        if (config.removeOption("global-playerlist.update-latency")) {
             TAB.getInstance().getPlatform().logInfo(IChatBaseComponent.fromColoredText("&ePerforming configuration conversion from 4.0.3 to 4.0.4"));
         }
-        config.removeOption("global-playerlist.update-latency");
     }
 
     public void convert409to410(@NotNull ConfigurationFile config) {

diff --git a/shared/src/main/java/me/neznamy/tab/shared/features/PlaceholderManagerImpl.java b/shared/src/main/java/me/neznamy/tab/shared/features/PlaceholderManagerImpl.java
@@ -16,6 +16,7 @@
 import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.placeholders.PlaceholderRefreshTask;
+import me.neznamy.tab.shared.placeholders.expansion.EmptyTabExpansion;
 import me.neznamy.tab.shared.platform.TabPlayer;
 import me.neznamy.tab.shared.event.impl.TabPlaceholderRegisterEvent;
 import me.neznamy.tab.shared.features.types.*;
@@ -37,6 +38,7 @@ public class PlaceholderManagerImpl extends TabFeature implements PlaceholderMan
     @Getter private final String featureName = "Refreshing placeholders";
     @Getter private final String refreshDisplayName = "Other";
 
+    private final boolean registerExpansion = TAB.getInstance().getConfig().getBoolean("placeholders.register-tab-expansion", true);
     private final Map<String, Integer> refreshIntervals = TAB.getInstance().getConfig().getConfigurationSection("placeholderapi-refresh-intervals");
     private final int defaultRefresh;
 
@@ -48,7 +50,8 @@ public class PlaceholderManagerImpl extends TabFeature implements PlaceholderMan
 
     @Getter private int loopTime;
 
-    @NonNull @Getter private final TabExpansion tabExpansion = TAB.getInstance().getPlatform().createTabExpansion();
+    @NotNull @Getter private final TabExpansion tabExpansion = registerExpansion ?
+            TAB.getInstance().getPlatform().createTabExpansion() : new EmptyTabExpansion();
 
     public PlaceholderManagerImpl() {
         TAB.getInstance().getMisconfigurationHelper().fixRefreshIntervals(refreshIntervals);

diff --git a/shared/src/main/resources/config.yml b/shared/src/main/resources/config.yml
@@ -186,6 +186,7 @@ placeholders:
   date-format: "dd.MM.yyyy"
   time-format: "[HH:mm:ss / h:mm a]"
   time-offset: 0
+  register-tab-expansion: true
 
 # https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Placeholder-output-replacements
 placeholder-output-replacements: