From 0a801f03e85cd69eaf0c768c9c2d189586a4d189 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Tue, 6 Nov 2018 00:09:40 -0500 Subject: [PATCH] clean up --- .gitignore | 4 ++ UltimateStacker.iml | 51 ------------------- .../ultimatestacker/UltimateStacker.java | 10 ++-- .../command/CommandManager.java | 8 +-- .../command/commands/CommandGive.java | 2 +- .../ultimatestacker/entity/EntityStack.java | 1 - .../entity/EntityStackManager.java | 3 +- .../events/BlockListeners.java | 4 +- .../events/DeathListeners.java | 8 +-- .../ultimatestacker/events/DropListeners.java | 4 +- .../events/ShearListeners.java | 2 +- .../events/SpawnerListeners.java | 6 --- .../handlers/HologramHandler.java | 23 ++++----- .../spawner/SpawnerStackManager.java | 5 +- .../storage/types/StorageMysql.java | 32 ++++++------ .../ultimatestacker/tasks/StackingTask.java | 12 +++-- .../ultimatestacker/utils/Methods.java | 4 +- 17 files changed, 64 insertions(+), 115 deletions(-) delete mode 100644 UltimateStacker.iml diff --git a/.gitignore b/.gitignore index af75203..4e8e97a 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,7 @@ target/classes/plugin\.yml target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles\.lst target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles\.lst + +\.idea/vcs\.xml + +UltimateStacker\.iml diff --git a/UltimateStacker.iml b/UltimateStacker.iml deleted file mode 100644 index b60163e..0000000 --- a/UltimateStacker.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - SPIGOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java index d82cc1f..1625849 100644 --- a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java +++ b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java @@ -5,6 +5,7 @@ import com.songoda.arconix.api.methods.serialize.Serialize; import com.songoda.arconix.api.utils.ConfigWrapper; import com.songoda.ultimatestacker.command.CommandManager; import com.songoda.ultimatestacker.entity.EntityStack; +import com.songoda.ultimatestacker.entity.EntityStackManager; import com.songoda.ultimatestacker.events.*; import com.songoda.ultimatestacker.handlers.HologramHandler; import com.songoda.ultimatestacker.spawner.SpawnerStack; @@ -14,7 +15,6 @@ import com.songoda.ultimatestacker.storage.StorageItem; import com.songoda.ultimatestacker.storage.StorageRow; import com.songoda.ultimatestacker.storage.types.StorageMysql; import com.songoda.ultimatestacker.storage.types.StorageYaml; -import com.songoda.ultimatestacker.entity.EntityStackManager; import com.songoda.ultimatestacker.tasks.StackingTask; import com.songoda.ultimatestacker.utils.ServerVersion; import com.songoda.ultimatestacker.utils.SettingsManager; @@ -57,6 +57,10 @@ public class UltimateStacker extends JavaPlugin { private ServerVersion serverVersion = ServerVersion.fromPackageName(Bukkit.getServer().getClass().getPackage().getName()); private Storage storage; + public static UltimateStacker getInstance() { + return INSTANCE; + } + public void onDisable() { this.saveToFile(); this.storage.closeConnection(); @@ -323,8 +327,4 @@ public class UltimateStacker extends JavaPlugin { public ConfigWrapper getSpawnerFile() { return spawnerFile; } - - public static UltimateStacker getInstance() { - return INSTANCE; - } } diff --git a/src/main/java/com/songoda/ultimatestacker/command/CommandManager.java b/src/main/java/com/songoda/ultimatestacker/command/CommandManager.java index dfdb8ac..c45fe68 100644 --- a/src/main/java/com/songoda/ultimatestacker/command/CommandManager.java +++ b/src/main/java/com/songoda/ultimatestacker/command/CommandManager.java @@ -2,8 +2,9 @@ package com.songoda.ultimatestacker.command; import com.songoda.arconix.api.methods.formatting.TextComponent; import com.songoda.ultimatestacker.UltimateStacker; -import com.songoda.ultimatestacker.command.AbstractCommand; -import com.songoda.ultimatestacker.command.commands.*; +import com.songoda.ultimatestacker.command.commands.CommandGive; +import com.songoda.ultimatestacker.command.commands.CommandReload; +import com.songoda.ultimatestacker.command.commands.CommandUltimateStacker; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -15,9 +16,8 @@ import java.util.List; public class CommandManager implements CommandExecutor { - private UltimateStacker instance; - private static final List commands = new ArrayList<>(); + private UltimateStacker instance; public CommandManager(UltimateStacker instance) { this.instance = instance; diff --git a/src/main/java/com/songoda/ultimatestacker/command/commands/CommandGive.java b/src/main/java/com/songoda/ultimatestacker/command/commands/CommandGive.java index ad4bb27..a8d839d 100644 --- a/src/main/java/com/songoda/ultimatestacker/command/commands/CommandGive.java +++ b/src/main/java/com/songoda/ultimatestacker/command/commands/CommandGive.java @@ -28,7 +28,7 @@ public class CommandGive extends AbstractCommand { EntityType type = null; for (EntityType types : EntityType.values()) { String input = args[2].toUpperCase().replace("_", "").replace(" ", ""); - String compare = types.name().toUpperCase().replace("_", "").replace(" ", ""); + String compare = types.name().toUpperCase().replace("_", "").replace(" ", ""); if (input.equals(compare)) type = types; } diff --git a/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java b/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java index b6bed06..53fedf0 100644 --- a/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java +++ b/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java @@ -1,6 +1,5 @@ package com.songoda.ultimatestacker.entity; -import com.songoda.arconix.api.methods.formatting.TextComponent; import com.songoda.ultimatestacker.utils.Methods; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/songoda/ultimatestacker/entity/EntityStackManager.java b/src/main/java/com/songoda/ultimatestacker/entity/EntityStackManager.java index bce21cb..dbea241 100644 --- a/src/main/java/com/songoda/ultimatestacker/entity/EntityStackManager.java +++ b/src/main/java/com/songoda/ultimatestacker/entity/EntityStackManager.java @@ -12,7 +12,7 @@ public class EntityStackManager { // These are all stacked mobs loaded into memory. private static final Map stacks = new HashMap<>(); - public EntityStack addStack (EntityStack stack) { + public EntityStack addStack(EntityStack stack) { stacks.put(stack.getEntity().getUniqueId(), stack); return stack; } @@ -46,5 +46,4 @@ public class EntityStackManager { } - } diff --git a/src/main/java/com/songoda/ultimatestacker/events/BlockListeners.java b/src/main/java/com/songoda/ultimatestacker/events/BlockListeners.java index 2d9ed7a..ec37100 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/BlockListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/BlockListeners.java @@ -48,7 +48,7 @@ public class BlockListeners implements Listener { int specific = instance.getSpawnerFile().getConfig().getInt("Spawners." + cs.getSpawnedType().name() + ".Max Stack Size"); int maxStackSize = specific == -1 ? instance.getConfig().getInt("Spawners.Max Stack Size") : specific; - cs = (CreatureSpawner)block.getState(); + cs = (CreatureSpawner) block.getState(); EntityType blockType = cs.getSpawnedType(); @@ -102,7 +102,7 @@ public class BlockListeners implements Listener { if (!instance.getConfig().getBoolean("Main.Stack Spawners")) return; - CreatureSpawner cs = (CreatureSpawner)block.getState(); + CreatureSpawner cs = (CreatureSpawner) block.getState(); EntityType blockType = cs.getSpawnedType(); diff --git a/src/main/java/com/songoda/ultimatestacker/events/DeathListeners.java b/src/main/java/com/songoda/ultimatestacker/events/DeathListeners.java index a4addf4..fe506ff 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/DeathListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/DeathListeners.java @@ -1,7 +1,7 @@ package com.songoda.ultimatestacker.events; -import com.songoda.ultimatestacker.entity.EntityStack; import com.songoda.ultimatestacker.UltimateStacker; +import com.songoda.ultimatestacker.entity.EntityStack; import com.songoda.ultimatestacker.entity.EntityStackManager; import org.bukkit.entity.*; import org.bukkit.event.EventHandler; @@ -30,7 +30,7 @@ public class DeathListeners implements Listener { EntityStack stack = stackManager.getStack(killed); if (instance.getConfig().getBoolean("Entity.Kill Whole Stack On Death")) { - for (int i = 1; i < stack.getAmount(); i ++) { + for (int i = 1; i < stack.getAmount(); i++) { LivingEntity newEntity = newEntity(killed); newEntity.damage(99999); } @@ -48,7 +48,7 @@ public class DeathListeners implements Listener { } private LivingEntity newEntity(LivingEntity killed) { - LivingEntity newEntity = (LivingEntity)killed.getWorld().spawnEntity(killed.getLocation(), killed.getType()); + LivingEntity newEntity = (LivingEntity) killed.getWorld().spawnEntity(killed.getLocation(), killed.getType()); newEntity.setVelocity(killed.getVelocity()); if (killed instanceof Ageable && !((Ageable) killed).isAdult()) { ((Ageable) newEntity).setBaby(); @@ -59,7 +59,7 @@ public class DeathListeners implements Listener { } if (killed instanceof Villager) { - ((Villager)newEntity).setProfession(((Villager)killed).getProfession()); + ((Villager) newEntity).setProfession(((Villager) killed).getProfession()); } return newEntity; } diff --git a/src/main/java/com/songoda/ultimatestacker/events/DropListeners.java b/src/main/java/com/songoda/ultimatestacker/events/DropListeners.java index fb3b149..553512c 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/DropListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/DropListeners.java @@ -1,12 +1,10 @@ package com.songoda.ultimatestacker.events; import com.songoda.ultimatestacker.UltimateStacker; -import org.bukkit.Bukkit; -import org.bukkit.entity.*; +import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerDropItemEvent; -import org.bukkit.inventory.ItemStack; public class DropListeners implements Listener { diff --git a/src/main/java/com/songoda/ultimatestacker/events/ShearListeners.java b/src/main/java/com/songoda/ultimatestacker/events/ShearListeners.java index 7f4ed7d..562ca97 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/ShearListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/ShearListeners.java @@ -1,7 +1,7 @@ package com.songoda.ultimatestacker.events; -import com.songoda.ultimatestacker.entity.EntityStack; import com.songoda.ultimatestacker.UltimateStacker; +import com.songoda.ultimatestacker.entity.EntityStack; import com.songoda.ultimatestacker.entity.EntityStackManager; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/com/songoda/ultimatestacker/events/SpawnerListeners.java b/src/main/java/com/songoda/ultimatestacker/events/SpawnerListeners.java index 3147a49..718f75f 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/SpawnerListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/SpawnerListeners.java @@ -1,16 +1,10 @@ package com.songoda.ultimatestacker.events; import com.songoda.ultimatestacker.UltimateStacker; -import com.songoda.ultimatestacker.entity.EntityStack; -import com.songoda.ultimatestacker.utils.Methods; -import org.bukkit.Bukkit; -import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.SpawnerSpawnEvent; -import java.util.List; - public class SpawnerListeners implements Listener { private UltimateStacker instance; diff --git a/src/main/java/com/songoda/ultimatestacker/handlers/HologramHandler.java b/src/main/java/com/songoda/ultimatestacker/handlers/HologramHandler.java index 7cad8c1..97a9834 100644 --- a/src/main/java/com/songoda/ultimatestacker/handlers/HologramHandler.java +++ b/src/main/java/com/songoda/ultimatestacker/handlers/HologramHandler.java @@ -7,7 +7,6 @@ import com.songoda.ultimatestacker.spawner.SpawnerStack; import com.songoda.ultimatestacker.utils.Methods; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; @@ -36,13 +35,13 @@ public class HologramHandler { } public void updateHologram(SpawnerStack spawner) { - if (spawner == null) return; + if (spawner == null) return; - Location location = spawner.getLocation().add(0.5, 1, 0.5); + Location location = spawner.getLocation().add(0.5, 1, 0.5); - if (!instance.getConfig().getBoolean("Spawners.Holograms Enabled")) return; + if (!instance.getConfig().getBoolean("Spawners.Holograms Enabled")) return; - addHologram(location, spawner); + addHologram(location, spawner); } public void despawn(Block b) { @@ -51,19 +50,19 @@ public class HologramHandler { } private void addHologram(Location location, SpawnerStack spawner) { - int amount = spawner.getAmount(); + int amount = spawner.getAmount(); - CreatureSpawner creatureSpawner = (CreatureSpawner)spawner.getLocation().getBlock().getState(); - String name = Methods.compileSpawnerName(creatureSpawner.getSpawnedType(), amount); + CreatureSpawner creatureSpawner = (CreatureSpawner) spawner.getLocation().getBlock().getState(); + String name = Methods.compileSpawnerName(creatureSpawner.getSpawnedType(), amount); - HologramObject hologram = new HologramObject(null, location, name); + HologramObject hologram = new HologramObject(null, location, name); - Arconix.pl().getApi().packetLibrary.getHologramManager().addHologram(hologram); + Arconix.pl().getApi().packetLibrary.getHologramManager().addHologram(hologram); } public void processChange(Block block) { if (!block.getType().name().contains("SPAWNER")) return; - SpawnerStack spawner = instance.getSpawnerStackManager().getSpawner(block); - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(instance, () -> updateHologram(spawner), 1L); + SpawnerStack spawner = instance.getSpawnerStackManager().getSpawner(block); + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(instance, () -> updateHologram(spawner), 1L); } } \ No newline at end of file diff --git a/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStackManager.java b/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStackManager.java index c43076b..c7ff632 100644 --- a/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStackManager.java +++ b/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStackManager.java @@ -3,7 +3,10 @@ package com.songoda.ultimatestacker.spawner; import org.bukkit.Location; import org.bukkit.block.Block; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; public class SpawnerStackManager { diff --git a/src/main/java/com/songoda/ultimatestacker/storage/types/StorageMysql.java b/src/main/java/com/songoda/ultimatestacker/storage/types/StorageMysql.java index 357c5d0..3dbe2dd 100644 --- a/src/main/java/com/songoda/ultimatestacker/storage/types/StorageMysql.java +++ b/src/main/java/com/songoda/ultimatestacker/storage/types/StorageMysql.java @@ -17,8 +17,8 @@ import java.util.Map; public class StorageMysql extends Storage { - private MySQLDatabase database; private static List toSave = new ArrayList<>(); + private MySQLDatabase database; public StorageMysql(UltimateStacker instance) { super(instance); @@ -65,29 +65,29 @@ public class StorageMysql extends Storage { @Override public void prepareSaveItem(String group, StorageItem... items) { - StringBuilder sql = new StringBuilder(String.format("INSERT INTO `" + instance.getConfig().getString("Database.Prefix") + "%s`", group)); + StringBuilder sql = new StringBuilder(String.format("INSERT INTO `" + instance.getConfig().getString("Database.Prefix") + "%s`", group)); - sql.append(" ("); + sql.append(" ("); - for (StorageItem item : items) { - if (item == null || item.asObject() == null) continue; - sql.append(String.format("`%s`, ", item.getKey())); - } + for (StorageItem item : items) { + if (item == null || item.asObject() == null) continue; + sql.append(String.format("`%s`, ", item.getKey())); + } - sql = new StringBuilder(sql.substring(0, sql.length() - 2)); + sql = new StringBuilder(sql.substring(0, sql.length() - 2)); - sql.append(") VALUES ("); + sql.append(") VALUES ("); - for (StorageItem item : items) { - if (item == null || item.asObject() == null) continue; - sql.append(String.format("'%s', ", item.asObject().toString())); - } + for (StorageItem item : items) { + if (item == null || item.asObject() == null) continue; + sql.append(String.format("'%s', ", item.asObject().toString())); + } - sql = new StringBuilder(sql.substring(0, sql.length() - 2)); + sql = new StringBuilder(sql.substring(0, sql.length() - 2)); - sql.append(");"); + sql.append(");"); - toSave.add(sql.toString()); + toSave.add(sql.toString()); } @Override diff --git a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java index 6485e82..8437b86 100644 --- a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java +++ b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java @@ -8,7 +8,10 @@ import com.songoda.ultimatestacker.utils.Methods; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.entity.*; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Item; +import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; @@ -54,10 +57,11 @@ public class StackingTask extends BukkitRunnable { nextEntity: for (Entity entityO : world.getEntities()) { - if (entityO instanceof Item && instance.getConfig().getBoolean( "Main.Stack Items")) { + if (entityO instanceof Item && instance.getConfig().getBoolean("Main.Stack Items")) { ItemStack item = ((Item) entityO).getItemStack(); - if (entityO.isCustomNameVisible() && !entityO.getCustomName().contains(TextComponent.convertToInvisibleString("IS")) || item.hasItemMeta() && item.getItemMeta().hasDisplayName()) continue; + if (entityO.isCustomNameVisible() && !entityO.getCustomName().contains(TextComponent.convertToInvisibleString("IS")) || item.hasItemMeta() && item.getItemMeta().hasDisplayName()) + continue; if (item.getMaxStackSize() != maxItemStackSize && item.getMaxStackSize() != 1) setMax(item, false); @@ -130,7 +134,7 @@ public class StackingTask extends BukkitRunnable { int maxItemStackSize = specific == -1 ? instance.getConfig().getInt("Item.Max Stack Size") : specific; Object objItemStack = methodGetItem.invoke(methodAsNMSCopy.invoke(null, item)); fieldMaxStackSize.set(objItemStack, reset ? new ItemStack(item.getType()).getMaxStackSize() : maxItemStackSize); - } catch(ReflectiveOperationException e) { + } catch (ReflectiveOperationException e) { e.printStackTrace(); } return item; diff --git a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java index a340e72..7c2ae0a 100644 --- a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java +++ b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java @@ -42,7 +42,7 @@ public class Methods { } if (initalEntity instanceof Villager) { - Villager villager = ((Villager)initalEntity); + Villager villager = ((Villager) initalEntity); entityList.removeIf(entity -> ((Villager) entity).getProfession() != villager.getProfession()); } @@ -101,7 +101,7 @@ public class Methods { ItemStack item = new ItemStack(Material.MOB_SPAWNER, 1); ItemMeta meta = item.getItemMeta(); meta.setDisplayName(Methods.compileSpawnerName(entityType, amount)); - CreatureSpawner cs = (CreatureSpawner) ((BlockStateMeta)meta).getBlockState(); + CreatureSpawner cs = (CreatureSpawner) ((BlockStateMeta) meta).getBlockState(); cs.setSpawnedType(entityType); ((BlockStateMeta) meta).setBlockState(cs); item.setItemMeta(meta);