diff --git a/api/src/main/java/net/momirealms/customnameplates/api/ConfigManager.java b/api/src/main/java/net/momirealms/customnameplates/api/ConfigManager.java index ec2a530..e00fc6f 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/ConfigManager.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/ConfigManager.java @@ -102,6 +102,7 @@ public abstract class ConfigManager implements ConfigLoader, Reloadable { protected boolean packItemsAdder; protected boolean packItemsAdderLegacy; protected boolean packOraxen; + protected boolean packNexo; protected boolean packCreativeCentral; protected boolean chatUnsafe; @@ -183,6 +184,7 @@ public abstract class ConfigManager implements ConfigLoader, Reloadable { if (packItemsAdder) packItemsAdderLegacy = false; packOraxen = config.getBoolean("integrations.resource-pack.Oraxen", false); packCreativeCentral = config.getBoolean("integrations.resource-pack.Creative-Central"); + packNexo = config.getBoolean("integrations.resource-pack.Nexo"); chatUnsafe = config.getBoolean("other-settings.unsafe-chat-event", false); chatEss = config.getBoolean("integrations.chat.Essentials", false); @@ -309,6 +311,10 @@ public abstract class ConfigManager implements ConfigLoader, Reloadable { return instance.packOraxen; } + public static boolean packNexo() { + return instance.packNexo; + } + public static boolean packCreativeCentral() { return instance.packCreativeCentral; } public static boolean hideScoreBoardNumber() { diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/bossbar/BossBarManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/bossbar/BossBarManagerImpl.java index e2afb7b..912b3f7 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/bossbar/BossBarManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/bossbar/BossBarManagerImpl.java @@ -84,14 +84,19 @@ public class BossBarManagerImpl implements BossBarManager, JoinQuitListener { @Override public void onPlayerJoin(CNPlayer player) { if (!ConfigManager.bossbarModule()) return; - plugin.getScheduler().asyncLater(() -> { + Runnable r = () -> { if (!player.isOnline()) return; BossBarDisplayController sender = new BossBarDisplayController(this, player); BossBarDisplayController previous = senders.put(player.uuid(), sender); if (previous != null) { previous.destroy(); } - }, ConfigManager.delaySend() * 50L, TimeUnit.MILLISECONDS); + }; + if (ConfigManager.delaySend() <= 0) { + r.run(); + } else { + plugin.getScheduler().asyncLater(r, ConfigManager.delaySend() * 50L, TimeUnit.MILLISECONDS); + } } @Override diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java index 6a6d852..3a56c6e 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java @@ -236,6 +236,13 @@ public class ResourcePackManagerImpl implements ResourcePackManager { plugin.getPluginLogger().warn("Failed to copy files to Oraxen", e); } } + if (ConfigManager.packNexo()){ + try { + FileUtils.copyDirectory(new File(resourcePackFolder, "assets"), new File(pluginsFolder, "Nexo" + File.separator + "pack" + File.separator + "assets")); + } catch (IOException e){ + plugin.getPluginLogger().warn("Failed to copy files to Nexo", e); + } + } if(ConfigManager.packCreativeCentral()) { try { FileUtils.copyDirectory(new File(resourcePackFolder, "assets"), new File(pluginsFolder, "creative-central" + File.separator + "resources" + File.separator + "assets")); diff --git a/backend/src/main/resources/config.yml b/backend/src/main/resources/config.yml index de8e755..2f58558 100644 --- a/backend/src/main/resources/config.yml +++ b/backend/src/main/resources/config.yml @@ -23,8 +23,9 @@ modules: integrations: resource-pack: ItemsAdder: false # Integration with ItemsAdder - ItemsAdder-old-method: false # Old method for ItemsAdder + ItemsAdder-old-method: false # Legacy integration with ItemsAdder Oraxen: false # Integration with Oraxen + Nexo: false # Integration with Nexo Creative-Central: false # Integration with Creative-Central chat: TrChat: false # Integration with TrChat diff --git a/gradle.properties b/gradle.properties index b4e40ef..91fcc67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Project settings # Rule: [major update].[feature update].[bug fix] project_version=3.0.15 -config_version=33 +config_version=34 project_group=net.momirealms # Supported languages