From bd9f3d74ee3574cadf7b88bcf05160385e5dd321 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Mon, 13 Dec 2021 15:09:50 +0100 Subject: [PATCH 1/4] pom.xml: Minor cleanup --- pom.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pom.xml b/pom.xml index c2be678..6722717 100644 --- a/pom.xml +++ b/pom.xml @@ -6,20 +6,24 @@ clean install EpicHoppers-${project.version} + org.apache.maven.plugins maven-compiler-plugin 3.8.0 + 1.8 1.8 + com.google.code.maven-replacer-plugin replacer 1.5.3 + prepare-package @@ -28,6 +32,7 @@ + ${project.build.directory}/classes/plugin.yml @@ -38,10 +43,12 @@ + org.apache.maven.plugins maven-shade-plugin 3.3.0-SNAPSHOT + shaded @@ -49,14 +56,17 @@ shade + false false + com.songoda:SongodaCore + *:* @@ -67,6 +77,7 @@ + com.songoda.core @@ -79,26 +90,31 @@ + apache.snapshots https://repository.apache.org/snapshots/ + public https://repo.songoda.com/repository/public/ + jitpack.io https://jitpack.io + spigotmc-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + org.spigotmc @@ -106,42 +122,49 @@ 1.18-R0.1-SNAPSHOT provided + com.songoda skyblock 2.3.30 provided + com.songoda SongodaCore 2.6.5 compile + com.songoda EpicFarming 3.0.24 provided + com.github.brcdev-minecraft shopgui-api 2.2.0 provided + com.songoda UltimateStacker 2.1.6 provided + com.bgsoftware wildstacker 3.5.1 provided + com.github.DeadSilenceIV AdvancedChestsAPI From d16b93aaed1dd2c8e301d78559dad44285a24b6c Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Tue, 14 Dec 2021 21:02:41 +0100 Subject: [PATCH 2/4] Update SongodaCore to v2.6.7 Fixes SD-8871 and other bugs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6722717..1aacc87 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ com.songoda SongodaCore - 2.6.5 + 2.6.7 compile From 95a1db50b365fff387439f726fc4cefb1af8925b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Tue, 14 Dec 2021 21:17:51 +0100 Subject: [PATCH 3/4] Minor code cleanup Replaced some use of Material with CompatibleMaterial in hopes for the legacy Meterial system to not trigger but without any luck --- .../java/com/songoda/epichoppers/EpicHoppers.java | 13 +++++++------ .../songoda/epichoppers/gui/GUIAutoSellFilter.java | 10 +++++----- .../java/com/songoda/epichoppers/gui/GUIFilter.java | 6 +++--- src/main/resources/plugin.yml | 6 +++--- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/songoda/epichoppers/EpicHoppers.java b/src/main/java/com/songoda/epichoppers/EpicHoppers.java index 5a78f51..93f8926 100644 --- a/src/main/java/com/songoda/epichoppers/EpicHoppers.java +++ b/src/main/java/com/songoda/epichoppers/EpicHoppers.java @@ -23,7 +23,6 @@ import com.songoda.epichoppers.commands.CommandSettings; import com.songoda.epichoppers.containers.ContainerManager; import com.songoda.epichoppers.database.DataManager; import com.songoda.epichoppers.database.migrations._1_InitialMigration; -import com.songoda.epichoppers.hopper.teleport.TeleportHandler; import com.songoda.epichoppers.hopper.HopperManager; import com.songoda.epichoppers.hopper.levels.Level; import com.songoda.epichoppers.hopper.levels.LevelManager; @@ -34,6 +33,7 @@ import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoSmelter; import com.songoda.epichoppers.hopper.levels.modules.ModuleBlockBreak; import com.songoda.epichoppers.hopper.levels.modules.ModuleMobHopper; import com.songoda.epichoppers.hopper.levels.modules.ModuleSuction; +import com.songoda.epichoppers.hopper.teleport.TeleportHandler; import com.songoda.epichoppers.listeners.BlockListeners; import com.songoda.epichoppers.listeners.EntityListeners; import com.songoda.epichoppers.listeners.HopperListeners; @@ -46,7 +46,6 @@ import com.songoda.epichoppers.utils.Methods; import com.songoda.skyblock.SkyBlock; import com.songoda.skyblock.permission.BasicPermission; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -235,18 +234,20 @@ public class EpicHoppers extends SongodaPlugin { private void saveModules() { if (levelManager != null) { - for (Level level : levelManager.getLevels().values()) - for (Module module : level.getRegisteredModules()) + for (Level level : levelManager.getLevels().values()) { + for (Module module : level.getRegisteredModules()) { module.saveDataToFile(); + } + } } } public ItemStack newHopperItem(Level level) { - ItemStack item = new ItemStack(Material.HOPPER, 1); + ItemStack item = new ItemStack(CompatibleMaterial.HOPPER.getMaterial()); ItemMeta itemmeta = item.getItemMeta(); itemmeta.setDisplayName(TextUtils.formatText(Methods.formatName(level.getLevel()))); String line = getLocale().getMessage("general.nametag.lore").getMessage(); - if (!line.equals("")) { + if (!line.isEmpty()) { itemmeta.setLore(Arrays.asList(line.split("\n"))); } item.setItemMeta(itemmeta); diff --git a/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java b/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java index 6465978..f4b25ef 100644 --- a/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java +++ b/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java @@ -58,7 +58,7 @@ public class GUIAutoSellFilter extends CustomizableGui { mirrorFill("mirrorfill_9", 4, 7, false, false, glass1); setButton("back", 8, GuiUtils.createButtonItem(CompatibleMaterial.ARROW.getItem(), - plugin.getLocale().getMessage("general.nametag.back").getMessage()), + plugin.getLocale().getMessage("general.nametag.back").getMessage()), (event) -> { hopper.overview(guiManager, event.player); compile(); @@ -101,7 +101,7 @@ public class GUIAutoSellFilter extends CustomizableGui { } // Info item - indicatorItem = new ItemStack(Material.PAPER, 1); + indicatorItem = new ItemStack(CompatibleMaterial.PAPER.getMaterial()); indicatorMeta = indicatorItem.getItemMeta(); indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.infotitle").getMessage()); @@ -135,7 +135,7 @@ public class GUIAutoSellFilter extends CustomizableGui { for (int slot : whiteListSlots) { if (slot != i) continue; - if (items[i] != null && items[i].getType() != Material.AIR) { + if (items[i] != null && !items[i].getType().isAir()) { ItemStack item = items[i]; if (item.getAmount() != 1) { item.setAmount(item.getAmount() - 1); @@ -150,7 +150,7 @@ public class GUIAutoSellFilter extends CustomizableGui { for (int slot : blackListSlots) { if (slot != i) continue; - if (items[i] != null && items[i].getType() != Material.AIR) { + if (items[i] != null && !items[i].getType().isAir()) { ItemStack item = items[i]; if (item.getAmount() != 1) { item.setAmount(item.getAmount() - 1); @@ -167,4 +167,4 @@ public class GUIAutoSellFilter extends CustomizableGui { plugin.getDataManager().updateItems(hopper, ItemType.WHITELIST, whiteListItems); plugin.getDataManager().updateItems(hopper, ItemType.BLACKLIST, blackListItems); } -} \ No newline at end of file +} diff --git a/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java b/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java index 520ef17..02d83d9 100644 --- a/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java +++ b/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java @@ -99,7 +99,7 @@ public class GUIFilter extends CustomizableGui { num++; } - it = new ItemStack(Material.BARRIER); + it = new ItemStack(CompatibleMaterial.BARRIER.getMaterial()); itm = it.getItemMeta(); itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.void").getMessage()); it.setItemMeta(itm); @@ -117,7 +117,7 @@ public class GUIFilter extends CustomizableGui { num++; } - ItemStack itemInfo = new ItemStack(Material.PAPER, 1); + ItemStack itemInfo = new ItemStack(CompatibleMaterial.PAPER.getMaterial()); ItemMeta itemmetaInfo = itemInfo.getItemMeta(); itemmetaInfo.setDisplayName(plugin.getLocale().getMessage("interface.filter.infotitle").getMessage()); ArrayList loreInfo = new ArrayList<>(); @@ -131,7 +131,7 @@ public class GUIFilter extends CustomizableGui { setItem("info", 16, itemInfo); - ItemStack hook = new ItemStack(Material.TRIPWIRE_HOOK, 1); + ItemStack hook = new ItemStack(CompatibleMaterial.TRIPWIRE_HOOK.getMaterial()); ItemMeta hookmeta = hook.getItemMeta(); hookmeta.setDisplayName(plugin.getLocale().getMessage("interface.hopper.rejectsync").getMessage()); ArrayList lorehook = new ArrayList<>(); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 06fa6f1..d203a20 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: EpicHoppers description: EpicHoppers main: com.songoda.epichoppers.EpicHoppers -softdepend: [FabledSkyBlock, LiquidTanks, UltimateStacker, WildStacker, Reserve, Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault, EpicFarming, AdvancedChests] +softdepend: [ FabledSkyBlock, LiquidTanks, UltimateStacker, WildStacker, Reserve, Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault, EpicFarming, AdvancedChests ] version: maven-version-number author: Songoda api-version: 1.13 @@ -9,5 +9,5 @@ commands: eh: description: View information on this plugin. default: true - aliases: [EpicHoppers] - usage: /eh \ No newline at end of file + aliases: [ EpicHoppers ] + usage: /eh From c056d9a50fc15286eb7b6f63b8adf67a26e3be0b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Tue, 14 Dec 2021 21:14:58 +0100 Subject: [PATCH 4/4] Release v4.7.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1aacc87..6efbd37 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHoppers 4.0.0 - 4.7.1 + 4.7.2 clean install EpicHoppers-${project.version}