From 82790e962ce65a1349fc68248da01ce4812a5f92 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Wed, 17 Oct 2018 17:13:52 -0400 Subject: [PATCH] Code cleanup. --- .../com/songoda/epicfarming/EpicFarmingPlugin.java | 9 ++++----- .../main/java/com/songoda/epicfarming/References.java | 2 +- .../songoda/epicfarming/command/CommandManager.java | 1 - .../command/commands/CommandGiveFarmItem.java | 2 -- .../java/com/songoda/epicfarming/farming/EFarm.java | 8 ++++++-- .../java/com/songoda/epicfarming/farming/ELevel.java | 2 +- .../songoda/epicfarming/listeners/BlockListeners.java | 1 - .../com/songoda/epicfarming/player/PlayerData.java | 2 +- .../com/songoda/epicfarming/tasks/EntityTask.java | 3 +-- .../java/com/songoda/epicfarming/tasks/FarmTask.java | 11 +++++------ .../com/songoda/epicfarming/tasks/GrowthTask.java | 4 ---- .../com/songoda/epicfarming/tasks/HopperTask.java | 8 -------- .../java/com/songoda/epicfarming/utils/Methods.java | 1 - 13 files changed, 19 insertions(+), 35 deletions(-) diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/EpicFarmingPlugin.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/EpicFarmingPlugin.java index 6eed84f..b160356 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/EpicFarmingPlugin.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/EpicFarmingPlugin.java @@ -75,7 +75,6 @@ public class EpicFarmingPlugin extends JavaPlugin implements EpicFarming { private BoostManager boostManager; private GrowthTask growthTask; - private HopperTask hopperTask; private FarmTask farmTask; private EntityTask entityTask; @@ -122,12 +121,12 @@ public class EpicFarmingPlugin extends JavaPlugin implements EpicFarming { } this.settingsManager = new SettingsManager(this); - setupConfig(); + this.setupConfig(); dataFile.createNewFile("Loading Data File", "EpicFarming Data File"); - loadDataFile(); + this.loadDataFile(); - loadLevelManager(); + this.loadLevelManager(); this.farmManager = new EFarmManager(); this.playerActionManager = new PlayerActionManager(); @@ -193,7 +192,7 @@ public class EpicFarmingPlugin extends JavaPlugin implements EpicFarming { // Start tasks this.growthTask = GrowthTask.startTask(this); - this.hopperTask = HopperTask.startTask(this); + HopperTask.startTask(this); this.farmTask = FarmTask.startTask(this); this.entityTask = entityTask.startTask(this); diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/References.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/References.java index 277a548..9a14f82 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/References.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/References.java @@ -4,7 +4,7 @@ public class References { private String prefix; - public References() { + References() { prefix = EpicFarmingPlugin.getInstance().getLocale().getMessage("general.nametag.prefix") + " "; } diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/CommandManager.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/CommandManager.java index d0b677a..be24d0f 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/CommandManager.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/CommandManager.java @@ -2,7 +2,6 @@ package com.songoda.epicfarming.command; import com.songoda.arconix.api.methods.formatting.TextComponent; import com.songoda.epicfarming.EpicFarmingPlugin; -import com.songoda.epicfarming.api.EpicFarming; import com.songoda.epicfarming.command.commands.*; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/commands/CommandGiveFarmItem.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/commands/CommandGiveFarmItem.java index 43372e0..2ad986b 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/commands/CommandGiveFarmItem.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/command/commands/CommandGiveFarmItem.java @@ -1,7 +1,5 @@ package com.songoda.epicfarming.command.commands; -import com.sk89q.worldedit.internal.expression.runtime.Return; -import com.songoda.arconix.api.methods.formatting.TextComponent; import com.songoda.arconix.plugin.Arconix; import com.songoda.epicfarming.EpicFarmingPlugin; import com.songoda.epicfarming.command.AbstractCommand; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/EFarm.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/EFarm.java index a71fc43..2acf2ce 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/EFarm.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/EFarm.java @@ -4,6 +4,7 @@ import com.songoda.arconix.api.methods.formatting.TextComponent; import com.songoda.arconix.api.methods.formatting.TimeComponent; import com.songoda.arconix.plugin.Arconix; import com.songoda.epicfarming.EpicFarmingPlugin; +import com.songoda.epicfarming.api.farming.Farm; import com.songoda.epicfarming.api.farming.Level; import com.songoda.epicfarming.api.farming.UpgradeType; import com.songoda.epicfarming.boost.BoostData; @@ -12,7 +13,10 @@ import com.songoda.epicfarming.utils.Debugger; import com.songoda.epicfarming.utils.Methods; import com.songoda.epicfarming.api.farming.Farm; import net.milkbowl.vault.economy.Economy; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; @@ -59,7 +63,7 @@ public class EFarm implements Farm { } } - private void setupOverview(Player player, String... arg) { + private void setupOverview(Player player) { Inventory inventory = Bukkit.createInventory(null, 54, Methods.formatName(level.getLevel(),false)); inventory.setContents(this.inventory.getContents()); this.inventory = inventory; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/ELevel.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/ELevel.java index a752e4e..b0f66e6 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/ELevel.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/ELevel.java @@ -16,7 +16,7 @@ public class ELevel implements Level { private List description = new ArrayList<>(); - public ELevel(int level, int costExperiance, int costEconomy, double speedMultiplier, int radius, boolean autoHarvest, boolean autoReplant, boolean autoBreeding) { + ELevel(int level, int costExperiance, int costEconomy, double speedMultiplier, int radius, boolean autoHarvest, boolean autoReplant, boolean autoBreeding) { this.level = level; this.costExperiance = costExperiance; this.costEconomy = costEconomy; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java index 0450265..53459ad 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java @@ -28,7 +28,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.permissions.PermissionAttachmentInfo; import java.util.Collection; -import java.util.List; /** * Created by songoda on 3/14/2017. diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/player/PlayerData.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/player/PlayerData.java index 5d0ef0f..ec6c297 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/player/PlayerData.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/player/PlayerData.java @@ -11,7 +11,7 @@ public class PlayerData { private final UUID playerUUID; private EFarm farm = null; - public PlayerData(UUID playerUUID) { + PlayerData(UUID playerUUID) { this.playerUUID = playerUUID; } diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/EntityTask.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/EntityTask.java index 2b84e56..488e6be 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/EntityTask.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/EntityTask.java @@ -6,7 +6,6 @@ import com.songoda.epicfarming.boost.BoostData; import com.songoda.epicfarming.utils.Debugger; import com.songoda.epicfarming.utils.EntityInfo; import com.songoda.epicfarming.utils.Methods; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; @@ -22,7 +21,7 @@ import java.util.stream.Collectors; public class EntityTask extends BukkitRunnable { private static final Random random = new Random(); - private Map lastTicksLived = new HashMap<>(); + private static Map lastTicksLived = new HashMap<>(); private static final Map ticksLived = new HashMap<>(); private static EntityTask instance; private static EpicFarmingPlugin plugin; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java index 6b57981..6ee9a45 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java @@ -1,31 +1,30 @@ package com.songoda.epicfarming.tasks; import com.songoda.epicfarming.EpicFarmingPlugin; -import com.songoda.epicfarming.api.EpicFarming; import com.songoda.epicfarming.api.farming.Farm; import com.songoda.epicfarming.boost.BoostData; import com.songoda.epicfarming.farming.Crop; import com.songoda.epicfarming.utils.CropType; import com.songoda.epicfarming.utils.Debugger; import com.songoda.epicfarming.utils.Methods; -import org.bukkit.*; +import org.bukkit.CropState; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; -import org.bukkit.entity.*; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.material.Crops; import org.bukkit.scheduler.BukkitRunnable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class FarmTask extends BukkitRunnable { private static FarmTask instance; private static EpicFarmingPlugin plugin; - private static final Random random = new Random(); - public static FarmTask startTask(EpicFarmingPlugin pl) { if (instance == null) { instance = new FarmTask(); diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java index 7c50b24..2850ac6 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java @@ -5,11 +5,7 @@ import com.songoda.epicfarming.farming.Crop; import org.bukkit.CropState; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; -import org.bukkit.block.Hopper; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; import org.bukkit.material.Crops; import org.bukkit.scheduler.BukkitRunnable; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java index 686b4f6..8f6656b 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java @@ -3,22 +3,14 @@ package com.songoda.epicfarming.tasks; import com.songoda.epicfarming.EpicFarmingPlugin; import com.songoda.epicfarming.api.farming.Farm; import com.songoda.epicfarming.api.farming.FarmManager; -import com.songoda.epicfarming.farming.Crop; -import org.bukkit.Bukkit; -import org.bukkit.CropState; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; import org.bukkit.block.Hopper; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.material.Crops; import org.bukkit.scheduler.BukkitRunnable; -import java.util.*; - public class HopperTask extends BukkitRunnable { private static HopperTask instance; diff --git a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/Methods.java b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/Methods.java index 0bb343c..753e806 100644 --- a/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/Methods.java +++ b/EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/Methods.java @@ -2,7 +2,6 @@ package com.songoda.epicfarming.utils; import com.songoda.arconix.plugin.Arconix; import com.songoda.epicfarming.EpicFarmingPlugin; -import com.songoda.epicfarming.api.EpicFarming; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material;