From ac8744c0f305e27ed8649b521072f7e9e74c7e92 Mon Sep 17 00:00:00 2001 From: Denis Istratov Date: Thu, 10 Aug 2023 14:06:53 +0300 Subject: [PATCH] 1.0.3a SNAPSHOT HOTFIX Fixes for clear spigot --- build.gradle | 2 +- .../redtea/nodropx/folia/FoliaSupporter.java | 21 +++++++++++-------- .../storage/singlepage/SinglePageGui.java | 3 ++- src/main/resources/config.yml | 1 + 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 0e0859a..d8c16ea 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'me.redtea' -version = '1.0.3-SNAPSHOT' +version = '1.0.3a-SNAPSHOT' repositories { mavenCentral() diff --git a/src/main/java/me/redtea/nodropx/folia/FoliaSupporter.java b/src/main/java/me/redtea/nodropx/folia/FoliaSupporter.java index ee9c45e..b360294 100644 --- a/src/main/java/me/redtea/nodropx/folia/FoliaSupporter.java +++ b/src/main/java/me/redtea/nodropx/folia/FoliaSupporter.java @@ -25,15 +25,18 @@ public class FoliaSupporter { @SneakyThrows public void run(RespawnService respawnService, Plugin plugin) { - String version = ((JsonObject) new JsonParser().parse(new FileReader("version_history.json"))).get("currentVersion").getAsString(); - if(!version.toLowerCase().contains("folia") && !plugin.getConfig().getBoolean("forceUseFoliaPatches")) { - return; - } - runningOnFolia = true; - plugin.getLogger().info("Found Folia! Applying patches for this..."); - this.respawnService = respawnService; - Bukkit.getPluginManager().registerEvents(new FoliaDeathListener(), plugin); - plugin.getLogger().info("Patches for Folia successfully applied!"); + try { + String version = ((JsonObject) new JsonParser().parse(new FileReader("version_history.json"))).get("currentVersion").getAsString(); + if(!version.toLowerCase().contains("folia") && !plugin.getConfig().getBoolean("forceUseFoliaPatches")) { + return; + } + runningOnFolia = true; + plugin.getLogger().info("Found Folia! Applying patches for this..."); + this.respawnService = respawnService; + Bukkit.getPluginManager().registerEvents(new FoliaDeathListener(), plugin); + plugin.getLogger().info("Patches for Folia successfully applied!"); + } catch (Throwable ignored) {} + } diff --git a/src/main/java/me/redtea/nodropx/menu/storage/singlepage/SinglePageGui.java b/src/main/java/me/redtea/nodropx/menu/storage/singlepage/SinglePageGui.java index a0ed1fd..b7b3cfb 100644 --- a/src/main/java/me/redtea/nodropx/menu/storage/singlepage/SinglePageGui.java +++ b/src/main/java/me/redtea/nodropx/menu/storage/singlepage/SinglePageGui.java @@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor; import me.redtea.nodropx.libs.carcadex.repo.MutableRepo; import me.redtea.nodropx.libs.message.container.Messages; import me.redtea.nodropx.menu.CachedMenu; +import me.redtea.nodropx.util.MD5ColorUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; @@ -25,7 +26,7 @@ public class SinglePageGui implements CachedMenu { player.openInventory(cache.get(player.getUniqueId())); return; } - Inventory gui = Bukkit.createInventory(null, 54, messages.get("gui.personalStorage.title").asComponent()); + Inventory gui = Bukkit.createInventory(null, 54, MD5ColorUtils.translateHexColorCodes(messages.get("gui.personalStorage.title").asUnparsedString())); for(ItemStack item : personalStorageRepo.get(player.getUniqueId()).orElse(new ArrayList<>())) if(item != null) gui.addItem(item); cache.put(player.getUniqueId(), gui); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 08f186f..de43bdc 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -6,5 +6,6 @@ checkForUpdates: true confirmThrowNoDropItem: true +#Single did not supports minimessages! #Can be SINGLE_PAGE or MULTI_PAGES personalStorageType: SINGLE_PAGE