From 7bd1157f07db722e57125a2626bfc6356f0299ad Mon Sep 17 00:00:00 2001 From: Esophose Date: Tue, 26 Mar 2019 14:35:17 -0600 Subject: [PATCH] WIP --- .../ultimatetimber/UltimateTimber.java | 3 +- .../{hooks => manager}/HookManager.java | 5 ++- .../manager/MessageManager.java | 11 +++++ .../manager/SettingsManager.java | 9 ++++ .../manager/TreeAnimationManager.java | 4 ++ .../manager/TreeDefinitionManager.java | 23 ++++++++++ .../ultimatetimber/tree/TreeDefinition.java | 9 ++++ .../treefall/TreeFallListener.java | 2 +- .../utils/LeafToSaplingConverter.java | 41 ----------------- .../utils/LogToLeafConverter.java | 45 ------------------- .../utils/WoodToLogConverter.java | 41 ----------------- 11 files changed, 62 insertions(+), 131 deletions(-) rename src/main/java/com/songoda/ultimatetimber/{hooks => manager}/HookManager.java (91%) create mode 100644 src/main/java/com/songoda/ultimatetimber/manager/MessageManager.java create mode 100644 src/main/java/com/songoda/ultimatetimber/manager/SettingsManager.java create mode 100644 src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java create mode 100644 src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java create mode 100644 src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java delete mode 100644 src/main/java/com/songoda/ultimatetimber/utils/LeafToSaplingConverter.java delete mode 100644 src/main/java/com/songoda/ultimatetimber/utils/LogToLeafConverter.java delete mode 100644 src/main/java/com/songoda/ultimatetimber/utils/WoodToLogConverter.java diff --git a/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java b/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java index d9c184c..eeb19a9 100644 --- a/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java +++ b/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java @@ -8,7 +8,6 @@ import com.songoda.ultimatetimber.adapter.legacy.LegacyAdapter; import com.songoda.ultimatetimber.utils.Metrics; import com.songoda.ultimatetimber.utils.NMSUtil; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; @@ -17,7 +16,7 @@ import org.bukkit.plugin.java.JavaPlugin; import com.songoda.ultimatetimber.commands.CommandHandler; import com.songoda.ultimatetimber.configurations.DefaultConfig; -import com.songoda.ultimatetimber.hooks.HookManager; +import com.songoda.ultimatetimber.manager.HookManager; import com.songoda.ultimatetimber.treefall.CustomLoot; import com.songoda.ultimatetimber.treefall.TreeFallAnimation; import com.songoda.ultimatetimber.treefall.TreeFallListener; diff --git a/src/main/java/com/songoda/ultimatetimber/hooks/HookManager.java b/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java similarity index 91% rename from src/main/java/com/songoda/ultimatetimber/hooks/HookManager.java rename to src/main/java/com/songoda/ultimatetimber/manager/HookManager.java index 6e42e9f..9664ec2 100644 --- a/src/main/java/com/songoda/ultimatetimber/hooks/HookManager.java +++ b/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java @@ -1,8 +1,11 @@ -package com.songoda.ultimatetimber.hooks; +package com.songoda.ultimatetimber.manager; import java.util.HashSet; import java.util.Set; +import com.songoda.ultimatetimber.hooks.JobsRebornHook; +import com.songoda.ultimatetimber.hooks.McMMOHook; +import com.songoda.ultimatetimber.hooks.TimberHook; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatetimber/manager/MessageManager.java b/src/main/java/com/songoda/ultimatetimber/manager/MessageManager.java new file mode 100644 index 0000000..8b0f665 --- /dev/null +++ b/src/main/java/com/songoda/ultimatetimber/manager/MessageManager.java @@ -0,0 +1,11 @@ +package com.songoda.ultimatetimber.manager; + +public class MessageManager { + + public enum MessageType { + TOGGLE_ON, + TOGGLE_OFF, + RELOAD + } + +} diff --git a/src/main/java/com/songoda/ultimatetimber/manager/SettingsManager.java b/src/main/java/com/songoda/ultimatetimber/manager/SettingsManager.java new file mode 100644 index 0000000..e2e961e --- /dev/null +++ b/src/main/java/com/songoda/ultimatetimber/manager/SettingsManager.java @@ -0,0 +1,9 @@ +package com.songoda.ultimatetimber.manager; + +public class SettingsManager { + + public enum TSetting { + + } + +} diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java new file mode 100644 index 0000000..2dda9c1 --- /dev/null +++ b/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java @@ -0,0 +1,4 @@ +package com.songoda.ultimatetimber.manager; + +public class TreeAnimationManager { +} diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java new file mode 100644 index 0000000..10a34d7 --- /dev/null +++ b/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java @@ -0,0 +1,23 @@ +package com.songoda.ultimatetimber.manager; + +import com.songoda.ultimatetimber.UltimateTimber; +import com.songoda.ultimatetimber.tree.TreeDefinition; + +import java.util.HashSet; +import java.util.Set; + +public class TreeDefinitionManager { + + private UltimateTimber ultimateTimber; + private Set treeDefinitions; + + public TreeDefinitionManager(UltimateTimber ultimateTimber) { + this.ultimateTimber = ultimateTimber; + this.treeDefinitions = new HashSet<>(); + } + + public void load() { + + } + +} diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java new file mode 100644 index 0000000..0f7d515 --- /dev/null +++ b/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java @@ -0,0 +1,9 @@ +package com.songoda.ultimatetimber.tree; + +public class TreeDefinition { + + public TreeDefinition() { + + } + +} diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallListener.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallListener.java index 6853d2f..a3df057 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallListener.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallListener.java @@ -15,7 +15,7 @@ import com.songoda.ultimatetimber.UltimateTimber; import com.songoda.ultimatetimber.configurations.DefaultConfig; import com.songoda.ultimatetimber.events.TreeFallEvent; import com.songoda.ultimatetimber.events.TreeFellEvent; -import com.songoda.ultimatetimber.hooks.HookManager; +import com.songoda.ultimatetimber.manager.HookManager; public class TreeFallListener implements Listener { diff --git a/src/main/java/com/songoda/ultimatetimber/utils/LeafToSaplingConverter.java b/src/main/java/com/songoda/ultimatetimber/utils/LeafToSaplingConverter.java deleted file mode 100644 index 4708648..0000000 --- a/src/main/java/com/songoda/ultimatetimber/utils/LeafToSaplingConverter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.songoda.ultimatetimber.utils; - -import org.bukkit.Material; - -public class LeafToSaplingConverter { - - /* - Defaults to returning the same material type that is fed into it - */ - public static Material convertLeaves(Material material) { - - switch (material) { - - case ACACIA_LEAVES: - material = org.bukkit.Material.ACACIA_SAPLING; - break; - case BIRCH_LEAVES: - material = org.bukkit.Material.BIRCH_SAPLING; - break; - case DARK_OAK_LEAVES: - material = org.bukkit.Material.DARK_OAK_SAPLING; - break; - case JUNGLE_LEAVES: - material = org.bukkit.Material.JUNGLE_SAPLING; - break; - case OAK_LEAVES: - material = org.bukkit.Material.OAK_SAPLING; - break; - case SPRUCE_LEAVES: - material = org.bukkit.Material.SPRUCE_SAPLING; - break; - default: - break; - - } - - return material; - - } - -} diff --git a/src/main/java/com/songoda/ultimatetimber/utils/LogToLeafConverter.java b/src/main/java/com/songoda/ultimatetimber/utils/LogToLeafConverter.java deleted file mode 100644 index 66ae513..0000000 --- a/src/main/java/com/songoda/ultimatetimber/utils/LogToLeafConverter.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.songoda.ultimatetimber.utils; - -import java.util.HashMap; -import java.util.Map; - -import org.bukkit.Material; - -public class LogToLeafConverter { - - private static Map logToLeaf; - - static { - logToLeaf = new HashMap<>(); - logToLeaf.put(Material.ACACIA_LOG, Material.ACACIA_LEAVES); - logToLeaf.put(Material.ACACIA_WOOD, Material.ACACIA_LEAVES); - logToLeaf.put(Material.STRIPPED_ACACIA_LOG, Material.ACACIA_LEAVES); - logToLeaf.put(Material.STRIPPED_ACACIA_WOOD, Material.ACACIA_LEAVES); - logToLeaf.put(Material.BIRCH_LOG, Material.BIRCH_LEAVES); - logToLeaf.put(Material.BIRCH_WOOD, Material.BIRCH_LEAVES); - logToLeaf.put(Material.STRIPPED_BIRCH_LOG, Material.BIRCH_LEAVES); - logToLeaf.put(Material.STRIPPED_BIRCH_WOOD, Material.BIRCH_LEAVES); - logToLeaf.put(Material.DARK_OAK_LOG, Material.DARK_OAK_LEAVES); - logToLeaf.put(Material.DARK_OAK_WOOD, Material.DARK_OAK_LEAVES); - logToLeaf.put(Material.STRIPPED_DARK_OAK_LOG, Material.DARK_OAK_LEAVES); - logToLeaf.put(Material.STRIPPED_DARK_OAK_WOOD, Material.DARK_OAK_LEAVES); - logToLeaf.put(Material.JUNGLE_LOG, Material.JUNGLE_LEAVES); - logToLeaf.put(Material.JUNGLE_WOOD, Material.JUNGLE_LEAVES); - logToLeaf.put(Material.STRIPPED_JUNGLE_LOG, Material.JUNGLE_LEAVES); - logToLeaf.put(Material.STRIPPED_JUNGLE_WOOD, Material.JUNGLE_LEAVES); - logToLeaf.put(Material.OAK_LOG, Material.OAK_LEAVES); - logToLeaf.put(Material.OAK_WOOD, Material.OAK_LEAVES); - logToLeaf.put(Material.STRIPPED_OAK_LOG, Material.OAK_LEAVES); - logToLeaf.put(Material.STRIPPED_OAK_WOOD, Material.OAK_LEAVES); - logToLeaf.put(Material.SPRUCE_LOG, Material.SPRUCE_LEAVES); - logToLeaf.put(Material.SPRUCE_WOOD, Material.SPRUCE_LEAVES); - logToLeaf.put(Material.STRIPPED_SPRUCE_LOG, Material.SPRUCE_LEAVES); - logToLeaf.put(Material.STRIPPED_SPRUCE_WOOD, Material.SPRUCE_LEAVES); - logToLeaf.put(Material.MUSHROOM_STEM, Material.MUSHROOM_STEM); - } - - public static Material convert(Material material) { - return logToLeaf.get(material); - } - -} diff --git a/src/main/java/com/songoda/ultimatetimber/utils/WoodToLogConverter.java b/src/main/java/com/songoda/ultimatetimber/utils/WoodToLogConverter.java deleted file mode 100644 index 1df009a..0000000 --- a/src/main/java/com/songoda/ultimatetimber/utils/WoodToLogConverter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.songoda.ultimatetimber.utils; - -import java.util.HashMap; -import java.util.Map; - -import org.bukkit.Material; - -public class WoodToLogConverter { - - private static Map woodToLog; - - static { - woodToLog = new HashMap<>(); - woodToLog.put(Material.ACACIA_WOOD, Material.ACACIA_LOG); - woodToLog.put(Material.STRIPPED_ACACIA_WOOD, Material.STRIPPED_ACACIA_LOG); - woodToLog.put(Material.BIRCH_WOOD, Material.BIRCH_LOG); - woodToLog.put(Material.STRIPPED_BIRCH_WOOD, Material.STRIPPED_BIRCH_LOG); - woodToLog.put(Material.DARK_OAK_WOOD, Material.DARK_OAK_LOG); - woodToLog.put(Material.STRIPPED_DARK_OAK_WOOD, Material.STRIPPED_DARK_OAK_LOG); - woodToLog.put(Material.JUNGLE_WOOD, Material.JUNGLE_LOG); - woodToLog.put(Material.STRIPPED_JUNGLE_WOOD, Material.STRIPPED_JUNGLE_LOG); - woodToLog.put(Material.OAK_WOOD, Material.OAK_LOG); - woodToLog.put(Material.STRIPPED_OAK_WOOD, Material.STRIPPED_OAK_LOG); - woodToLog.put(Material.SPRUCE_WOOD, Material.SPRUCE_LOG); - woodToLog.put(Material.STRIPPED_SPRUCE_WOOD, Material.STRIPPED_SPRUCE_LOG); - } - - /** - * Converts a Wood Material to its corresponding Log Material - * - * @param material The wood material - * @return The corresonding log material - */ - public static Material convert(Material material) { - Material converted = woodToLog.get(material); - if (converted == null) - return material; - return converted; - } - -}