From 93856fc5064d3350875a4eb2831702bce3648f4c Mon Sep 17 00:00:00 2001 From: MagmaGuy Date: Mon, 5 Nov 2018 21:14:53 +0000 Subject: [PATCH] Version 0.0.3 - Fully implemented reload command --- .idea/workspace.xml | 375 ++++++++++-------- pom.xml | 2 +- .../ultimatetimber/UltimateTimber.java | 2 +- .../commands/ReloadCommand.java | 4 +- .../configurations/DefaultConfig.java | 4 +- .../ultimatetimber/treefall/EventFilter.java | 6 +- .../treefall/TreeFallAnimation.java | 6 +- .../treefall/TreeFallEvent.java | 5 +- .../ultimatetimber/treefall/TreeReplant.java | 2 +- src/main/resources/plugin.yml | 2 +- target/maven-archiver/pom.properties | 2 +- 11 files changed, 217 insertions(+), 193 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 66774b0..9c9a3b0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,36 +1,18 @@ - - - - - - - - - - - - - - + - - + + + + + + + - - - - - - - - - - - + @@ -237,6 +226,13 @@ true DEFINITION_ORDER + + + @@ -248,9 +244,9 @@ + + + - + - + @@ -364,7 +369,9 @@ - - + + - + @@ -398,7 +413,7 @@ - + @@ -416,7 +431,7 @@ - + @@ -437,16 +452,14 @@ - + + - - - - - - - @@ -464,40 +477,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -508,20 +487,10 @@ - + - - - - - - - - - - - - + + @@ -530,18 +499,18 @@ - - + + - + - - + + @@ -551,27 +520,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -580,14 +529,88 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 474ae21..d816637 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ultimatetimber UltimateTimber - 1.0-SNAPSHOT + 0.0.3 UTF-8 diff --git a/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java b/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java index 9b086f5..2b47dcf 100644 --- a/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java +++ b/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java @@ -40,7 +40,7 @@ public class UltimateTimber extends JavaPlugin { Cache valid worlds for later use */ for (World world : Bukkit.getWorlds()) - if (DefaultConfig.configuration.getBoolean(DefaultConfig.VALID_WORLDS + world.getName())) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.VALID_WORLDS + world.getName())) validWorlds.add(world); this.getCommand("ultimatetimber").setExecutor(new CommandHandler()); diff --git a/src/main/java/com/songoda/ultimatetimber/commands/ReloadCommand.java b/src/main/java/com/songoda/ultimatetimber/commands/ReloadCommand.java index a633b94..c3e4fde 100644 --- a/src/main/java/com/songoda/ultimatetimber/commands/ReloadCommand.java +++ b/src/main/java/com/songoda/ultimatetimber/commands/ReloadCommand.java @@ -1,13 +1,13 @@ package com.songoda.ultimatetimber.commands; -import com.songoda.ultimatetimber.configurations.DefaultConfig; +import com.songoda.ultimatetimber.UltimateTimber; import org.bukkit.command.CommandSender; public class ReloadCommand { public static void reloadConfig(CommandSender commandSender) { - DefaultConfig.initialize(); + UltimateTimber.plugin.reloadConfig(); commandSender.sendMessage("[UltimateTimber] - Configuration reloaded"); diff --git a/src/main/java/com/songoda/ultimatetimber/configurations/DefaultConfig.java b/src/main/java/com/songoda/ultimatetimber/configurations/DefaultConfig.java index 85e5cf0..66c11ca 100644 --- a/src/main/java/com/songoda/ultimatetimber/configurations/DefaultConfig.java +++ b/src/main/java/com/songoda/ultimatetimber/configurations/DefaultConfig.java @@ -10,7 +10,7 @@ public class DefaultConfig { /* This value is just cached so it can easily and safely be accessed during runtime */ - public static Configuration configuration; +// public static Configuration configuration; /* Storing these values in final strings makes it so you can change the keys or refactor their names later on without @@ -29,7 +29,7 @@ public class DefaultConfig { public static void initialize() { - configuration = UltimateTimber.plugin.getConfig(); + Configuration configuration = UltimateTimber.plugin.getConfig(); configuration.addDefault(AXES_ONLY, true); configuration.addDefault(ACCURATE_AXE_DURABILITY, true); diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/EventFilter.java b/src/main/java/com/songoda/ultimatetimber/treefall/EventFilter.java index 024971f..4c1ee37 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/EventFilter.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/EventFilter.java @@ -24,11 +24,11 @@ public class EventFilter { /* Config-based catchers */ - if (DefaultConfig.configuration.getBoolean(DefaultConfig.CREATIVE_DISALLOWED) && + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.CREATIVE_DISALLOWED) && event.getPlayer().getGameMode().equals(GameMode.CREATIVE)) return false; - if (DefaultConfig.configuration.getBoolean(DefaultConfig.AXES_ONLY) && + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.AXES_ONLY) && !(event.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.DIAMOND_AXE) || event.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.GOLDEN_AXE) || event.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.IRON_AXE) || @@ -36,7 +36,7 @@ public class EventFilter { event.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.WOODEN_AXE))) return false; - if (DefaultConfig.configuration.getBoolean(DefaultConfig.PERMISSIONS_ONLY) && + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.PERMISSIONS_ONLY) && !event.getPlayer().hasPermission("ultimatetimber.chop")) return false; diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java index e01fa75..385d266 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java @@ -103,11 +103,11 @@ public class TreeFallAnimation { TreeLoot.convertFallingBlock(fallingBlock, player); fallingBlock.remove(); fallingBlock.getLocation().getWorld().spawnParticle(Particle.SMOKE_LARGE, fallingBlock.getLocation(), 3, 0.2, 0.2, 0.2, 0.05); - if (DefaultConfig.configuration.getBoolean(DefaultConfig.REPLANT_FROM_LEAVES)) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.REPLANT_FROM_LEAVES)) TreeReplant.leafFallReplant(fallingBlock); - if (DefaultConfig.configuration.getBoolean(DefaultConfig.DAMAGE_PLAYERS)) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.DAMAGE_PLAYERS)) TreeEntityDamage.runDamage(fallingBlock); - if (DefaultConfig.configuration.getBoolean(DefaultConfig.CUSTOM_AUDIO)) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.CUSTOM_AUDIO)) TreeSounds.fallNoise(fallingBlock, counter); } counter++; diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java index f1ea6f1..953f54b 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java @@ -1,5 +1,6 @@ package com.songoda.ultimatetimber.treefall; +import com.songoda.ultimatetimber.UltimateTimber; import com.songoda.ultimatetimber.configurations.DefaultConfig; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -21,9 +22,9 @@ public class TreeFallEvent implements Listener { if (!EventFilter.eventIsValid(event)) return; ArrayList blocks = TreeChecker.parseTree(event.getBlock()); if (blocks == null) return; - if (DefaultConfig.configuration.getBoolean(DefaultConfig.ACCURATE_AXE_DURABILITY)) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.ACCURATE_AXE_DURABILITY)) AxeDurability.adjustAxeDamage(blocks, event.getPlayer()); - if (DefaultConfig.configuration.getBoolean(DefaultConfig.CUSTOM_AUDIO)) + if (UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.CUSTOM_AUDIO)) TreeSounds.tipOverNoise(event.getBlock().getLocation()); TreeFallAnimation.startAnimation(event.getBlock(), blocks, event.getPlayer()); diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java index 4f75407..6b0d802 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java @@ -14,7 +14,7 @@ public class TreeReplant { public static void replaceOriginalBlock(Block block) { - if (!DefaultConfig.configuration.getBoolean(DefaultConfig.REPLANT_SAPLING)) { + if (!UltimateTimber.plugin.getConfig().getBoolean(DefaultConfig.REPLANT_SAPLING)) { block.setType(Material.AIR); return; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0f0c891..a4051c8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: UltimateTimber -version: 0.0.2 +version: 0.0.3 author: Songoda main: com.songoda.ultimatetimber.UltimateTimber api-version: 1.13 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index b4ed44f..2c17582 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Nov 05 04:04:50 GMT 2018 +#Mon Nov 05 21:06:51 GMT 2018 version=1.0-SNAPSHOT groupId=ultimatetimber artifactId=UltimateTimber