From 670e60f907fccc05ec2b5f1e9cc4384d7f366f89 Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 3 Jun 2020 07:41:22 -0500 Subject: [PATCH] Removed support for WIldStacker This will be far more functional and maintainable from their side. --- pom.xml | 6 - .../java/com/songoda/skyblock/SkyBlock.java | 1 - .../levelling/rework/IslandLevelManager.java | 7 - .../impl/WildStackerCalculator.java | 17 -- .../skyblock/listeners/WildStacker.java | 236 ------------------ 5 files changed, 267 deletions(-) delete mode 100644 src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/WildStackerCalculator.java delete mode 100644 src/main/java/com/songoda/skyblock/listeners/WildStacker.java diff --git a/pom.xml b/pom.xml index 9804f3f8..3a16a6ab 100644 --- a/pom.xml +++ b/pom.xml @@ -138,12 +138,6 @@ 1.7 provided - - com.github.OmerBenGera - WildStackerAPI - b15 - provided - com.songoda ultimatestacker diff --git a/src/main/java/com/songoda/skyblock/SkyBlock.java b/src/main/java/com/songoda/skyblock/SkyBlock.java index 53efdc30..551e91fb 100644 --- a/src/main/java/com/songoda/skyblock/SkyBlock.java +++ b/src/main/java/com/songoda/skyblock/SkyBlock.java @@ -186,7 +186,6 @@ public class SkyBlock extends SongodaPlugin { pluginManager.registerEvents(new FallBreak(this), this); if (pluginManager.isPluginEnabled("EpicSpawners")) pluginManager.registerEvents(new EpicSpawners(this), this); - if (pluginManager.isPluginEnabled("WildStacker")) pluginManager.registerEvents(new WildStacker(this), this); if (pluginManager.isPluginEnabled("UltimateStacker")) pluginManager.registerEvents(new UltimateStacker(this), this); diff --git a/src/main/java/com/songoda/skyblock/levelling/rework/IslandLevelManager.java b/src/main/java/com/songoda/skyblock/levelling/rework/IslandLevelManager.java index ecda1a27..2d8ee400 100644 --- a/src/main/java/com/songoda/skyblock/levelling/rework/IslandLevelManager.java +++ b/src/main/java/com/songoda/skyblock/levelling/rework/IslandLevelManager.java @@ -3,21 +3,16 @@ package com.songoda.skyblock.levelling.rework; import java.io.File; import java.util.ArrayList; import java.util.EnumMap; -import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.skyblock.utils.version.CompatibleSpawners; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.block.CreatureSpawner; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; @@ -31,7 +26,6 @@ import com.songoda.skyblock.levelling.rework.calculator.Calculator; import com.songoda.skyblock.levelling.rework.calculator.CalculatorRegistry; import com.songoda.skyblock.levelling.rework.calculator.impl.EpicSpawnerCalculator; import com.songoda.skyblock.levelling.rework.calculator.impl.UltimateStackerCalculator; -import com.songoda.skyblock.levelling.rework.calculator.impl.WildStackerCalculator; import com.songoda.skyblock.message.MessageManager; import com.songoda.skyblock.stackable.StackableManager; @@ -152,7 +146,6 @@ public final class IslandLevelManager { if (pm.isPluginEnabled("EpicSpawners")) CalculatorRegistry.registerCalculator(new EpicSpawnerCalculator(), spawner); if (pm.isPluginEnabled("UltimateStacker")) CalculatorRegistry.registerCalculator(new UltimateStackerCalculator(), spawner); - if (pm.isPluginEnabled("WildStacker")) CalculatorRegistry.registerCalculator(new WildStackerCalculator(), spawner); } private static final AmountMaterialPair EMPTY = new AmountMaterialPair(null, 0); diff --git a/src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/WildStackerCalculator.java b/src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/WildStackerCalculator.java deleted file mode 100644 index f8c06501..00000000 --- a/src/main/java/com/songoda/skyblock/levelling/rework/calculator/impl/WildStackerCalculator.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.songoda.skyblock.levelling.rework.calculator.impl; - -import org.bukkit.block.CreatureSpawner; - -import com.bgsoftware.wildstacker.api.WildStackerAPI; -import com.bgsoftware.wildstacker.api.objects.StackedSpawner; -import com.songoda.skyblock.levelling.rework.calculator.SpawnerCalculator; - -public class WildStackerCalculator implements SpawnerCalculator { - - @Override - public long getSpawnerAmount(CreatureSpawner spawner) { - final StackedSpawner stacked = WildStackerAPI.getStackedSpawner(spawner); - return stacked == null ? 0 : stacked.getStackAmount(); - } - -} diff --git a/src/main/java/com/songoda/skyblock/listeners/WildStacker.java b/src/main/java/com/songoda/skyblock/listeners/WildStacker.java deleted file mode 100644 index 35522a60..00000000 --- a/src/main/java/com/songoda/skyblock/listeners/WildStacker.java +++ /dev/null @@ -1,236 +0,0 @@ -package com.songoda.skyblock.listeners; - -import com.bgsoftware.wildstacker.api.events.*; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.skyblock.SkyBlock; -import com.songoda.skyblock.config.FileManager; -import com.songoda.skyblock.island.Island; -import com.songoda.skyblock.island.IslandLevel; -import com.songoda.skyblock.island.IslandManager; - -import com.songoda.skyblock.utils.version.CompatibleSpawners; -import com.songoda.skyblock.utils.version.NMSUtil; -import com.songoda.skyblock.world.WorldManager; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.EntityType; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; - -import java.io.File; - -public class WildStacker implements Listener { - - private final SkyBlock skyblock; - - public WildStacker(SkyBlock skyblock) { - this.skyblock = skyblock; - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBarrelPlace(BarrelPlaceEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getBarrel().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - Material material = event.getBarrel().getType(); - - if (NMSUtil.getVersionNumber() > 12 && material.name().startsWith("LEGACY_")) { - material = Material.matchMaterial(material.name().replace("LEGACY_", "")); - } - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleMaterial materials = CompatibleMaterial.getBlockMaterial(material); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - long materialAmount = 0; - if (level.hasMaterial(materials.name())) { - materialAmount = level.getMaterialAmount(materials.name()); - } - - level.setMaterialAmount(materials.name(), materialAmount + event.getBarrel().getStackAmount() - 1); // -1 because the Interact handler will always add +1 - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBarrelStack(BarrelStackEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getBarrel().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - Material material = event.getBarrel().getType(); - - if (NMSUtil.getVersionNumber() > 12 && material.name().startsWith("LEGACY_")) { - material = Material.matchMaterial(material.name().replace("LEGACY_", "")); - } - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleMaterial materials = CompatibleMaterial.getBlockMaterial(material); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - long materialAmount = 0; - if (level.hasMaterial(materials.name())) { - materialAmount = level.getMaterialAmount(materials.name()); - } - - level.setMaterialAmount(materials.name(), materialAmount + event.getTarget().getStackAmount() - 1); // -1 because the Interact handler will always add +1 - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBarrelUnstack(BarrelUnstackEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getBarrel().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - Material material = event.getBarrel().getType(); - - if (NMSUtil.getVersionNumber() > 12 && material.name().startsWith("LEGACY_")) { - material = Material.matchMaterial(material.name().replace("LEGACY_", "")); - } - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleMaterial materials = CompatibleMaterial.getBlockMaterial(material); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - if (level.hasMaterial(materials.name())) { - long materialAmount = level.getMaterialAmount(materials.name()); - - if (materialAmount - event.getAmount() <= 0) { - level.removeMaterial(materials.name()); - } else { - level.setMaterialAmount(materials.name(), materialAmount - event.getAmount()); - } - } - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onSpawnerPlace(SpawnerPlaceEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getSpawner().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - EntityType spawnerType = event.getSpawner().getSpawnedType(); - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleSpawners materials = CompatibleSpawners.getSpawner(spawnerType); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - long materialAmount = 0; - if (level.hasMaterial(materials.name())) { - materialAmount = level.getMaterialAmount(materials.name()); - } - - level.setMaterialAmount(materials.name(), materialAmount + event.getSpawner().getStackAmount()); - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onSpawnerStack(SpawnerStackEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getSpawner().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - EntityType spawnerType = event.getSpawner().getSpawnedType(); - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleSpawners materials = CompatibleSpawners.getSpawner(spawnerType); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - long materialAmount = 0; - if (level.hasMaterial(materials.name())) { - materialAmount = level.getMaterialAmount(materials.name()); - } - - level.setMaterialAmount(materials.name(), materialAmount + event.getTarget().getStackAmount()); - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onSpawnerUnstack(SpawnerUnstackEvent event) { - IslandManager islandManager = skyblock.getIslandManager(); - WorldManager worldManager = skyblock.getWorldManager(); - - Location location = event.getSpawner().getLocation(); - if (!worldManager.isIslandWorld(location.getWorld())) return; - - Island island = islandManager.getIslandAtLocation(location); - - EntityType spawnerType = event.getSpawner().getSpawnedType(); - - FileManager.Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")); - FileConfiguration configLoad = config.getFileConfiguration(); - - if (configLoad.getBoolean("Island.Block.Level.Enable")) { - CompatibleSpawners materials = CompatibleSpawners.getSpawner(spawnerType); - - if (materials != null) { - IslandLevel level = island.getLevel(); - - if (level.hasMaterial(materials.name())) { - long materialAmount = level.getMaterialAmount(materials.name()); - - if (materialAmount - event.getAmount() <= 0) { - level.removeMaterial(materials.name()); - } else { - level.setMaterialAmount(materials.name(), materialAmount - event.getAmount()); - } - } - } - } - } - -}