From 712cfeb9987f65fb4b178cf696fa1c9b47f986c0 Mon Sep 17 00:00:00 2001 From: Esophose Date: Wed, 21 Aug 2019 15:25:54 -0600 Subject: [PATCH 1/4] CoreProtect logging --- UltimateTimber-Adapter/Current/build.gradle | 2 +- UltimateTimber-Hook/CoreProtect/build.gradle | 5 ++ .../ultimatetimber/hook/CoreProtectHook.java | 49 +++++++++++++++++++ UltimateTimber-Hook/Jobs/build.gradle | 2 +- UltimateTimber-Hook/McMMO/build.gradle | 2 +- .../McMMOClassic13/build.gradle | 2 +- UltimateTimber/Plugin/build.gradle | 2 +- build.gradle | 1 + settings.gradle | 3 ++ 9 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 UltimateTimber-Hook/CoreProtect/build.gradle create mode 100644 UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java diff --git a/UltimateTimber-Adapter/Current/build.gradle b/UltimateTimber-Adapter/Current/build.gradle index 61abc4e..abf81d4 100644 --- a/UltimateTimber-Adapter/Current/build.gradle +++ b/UltimateTimber-Adapter/Current/build.gradle @@ -1,4 +1,4 @@ dependencies { compile project(':UltimateTimber-Core') - compileOnly 'org.spigotmc:spigot:1.14' + compileOnly 'org.spigotmc:spigot:1.14.4' } diff --git a/UltimateTimber-Hook/CoreProtect/build.gradle b/UltimateTimber-Hook/CoreProtect/build.gradle new file mode 100644 index 0000000..756387d --- /dev/null +++ b/UltimateTimber-Hook/CoreProtect/build.gradle @@ -0,0 +1,5 @@ +dependencies { + compile project(':UltimateTimber-Core') + compileOnly 'org.spigotmc:spigot:1.14.4' + compileOnly 'net:coreprotect:2.17.5' +} diff --git a/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java b/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java new file mode 100644 index 0000000..050444d --- /dev/null +++ b/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java @@ -0,0 +1,49 @@ +package com.songoda.ultimatetimber.hook; + +import com.songoda.ultimatetimber.tree.ITreeBlock; +import com.songoda.ultimatetimber.tree.TreeBlock; +import com.songoda.ultimatetimber.tree.TreeBlockSet; +import com.songoda.ultimatetimber.utils.NMSUtil; +import net.coreprotect.CoreProtect; +import net.coreprotect.CoreProtectAPI; +import org.bukkit.GameMode; +import org.bukkit.block.Block; +import org.bukkit.block.BlockState; +import org.bukkit.entity.Player; + +import java.util.ArrayList; + +public class CoreProtectHook implements TimberHook { + + private CoreProtectAPI api; + private boolean useDeprecatedMethod = NMSUtil.getVersionNumber() <= 12; + + public CoreProtectHook() { + this.api = CoreProtect.getInstance().getAPI(); + } + + @Override + public void applyExperience(Player player, TreeBlockSet treeBlocks) { + if (!this.api.isEnabled()) + return; + + for (ITreeBlock treeBlock : treeBlocks.getAllTreeBlocks()) { + if (this.useDeprecatedMethod) { + this.api.logRemoval(player.getName(), treeBlock.getLocation(), treeBlock.getBlock().getType(), treeBlock.getBlock().getData()); + } else { + this.api.logRemoval(player.getName(), treeBlock.getLocation(), treeBlock.getBlock().getType(), treeBlock.getBlock().getBlockData()); + } + } + } + + @Override + public boolean shouldApplyDoubleDrops(Player player) { + return false; + } + + @Override + public boolean isUsingAbility(Player player) { + return false; + } + +} diff --git a/UltimateTimber-Hook/Jobs/build.gradle b/UltimateTimber-Hook/Jobs/build.gradle index c31ee3b..415d168 100644 --- a/UltimateTimber-Hook/Jobs/build.gradle +++ b/UltimateTimber-Hook/Jobs/build.gradle @@ -1,5 +1,5 @@ dependencies { compile project(':UltimateTimber-Core') - compileOnly 'org.spigotmc:spigot:1.14' + compileOnly 'org.spigotmc:spigot:1.14.4' compileOnly 'com.gamingmesh:jobs:4.13.0' } diff --git a/UltimateTimber-Hook/McMMO/build.gradle b/UltimateTimber-Hook/McMMO/build.gradle index 9d7ade4..10e833e 100644 --- a/UltimateTimber-Hook/McMMO/build.gradle +++ b/UltimateTimber-Hook/McMMO/build.gradle @@ -1,5 +1,5 @@ dependencies { compile project(':UltimateTimber-Core') - compileOnly 'org.spigotmc:spigot:1.14' + compileOnly 'org.spigotmc:spigot:1.14.4' compileOnly 'com.gmail.nossr50:mcmmo:2.1.50' } diff --git a/UltimateTimber-Hook/McMMOClassic13/build.gradle b/UltimateTimber-Hook/McMMOClassic13/build.gradle index 0027165..d578ace 100644 --- a/UltimateTimber-Hook/McMMOClassic13/build.gradle +++ b/UltimateTimber-Hook/McMMOClassic13/build.gradle @@ -1,5 +1,5 @@ dependencies { compile project(':UltimateTimber-Core') - compileOnly 'org.spigotmc:spigot:1.14' + compileOnly 'org.spigotmc:spigot:1.14.4' compileOnly 'com.gmail.nossr50:mcmmo:1.6.0' } diff --git a/UltimateTimber/Plugin/build.gradle b/UltimateTimber/Plugin/build.gradle index 717a290..e0b4c98 100644 --- a/UltimateTimber/Plugin/build.gradle +++ b/UltimateTimber/Plugin/build.gradle @@ -13,7 +13,7 @@ dependencies { compile project(':UltimateTimber-McMMOClassic13') compile project(':UltimateTimber-McMMOClassic12') compile project(':UltimateTimber-McMMOClassic8') - compileOnly 'org.spigotmc:spigot:1.14' + compileOnly 'org.spigotmc:spigot:1.14.4' extraLibs 'com.songoda:songodaupdater:1' configurations.compileOnly.extendsFrom(configurations.extraLibs) diff --git a/build.gradle b/build.gradle index 2274eac..e45d5f5 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ dependencies { compile project(':UltimateTimber-McMMOClassic13') compile project(':UltimateTimber-McMMOClassic12') compile project(':UltimateTimber-McMMOClassic8') + compile project(':UltimateTimber-CoreProtect') compile project(':UltimateTimber-Plugin') } diff --git a/settings.gradle b/settings.gradle index 0ce995d..2925c38 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,5 +24,8 @@ project(':UltimateTimber-McMMOClassic12').projectDir = file('UltimateTimber-Hook include(':UltimateTimber-McMMOClassic8') project(':UltimateTimber-McMMOClassic8').projectDir = file('UltimateTimber-Hook/McMMOClassic8') +include(':UltimateTimber-CoreProtect') +project(':UltimateTimber-CoreProtect').projectDir = file('UltimateTimber-Hook/CoreProtect') + include(':UltimateTimber-Plugin') project(':UltimateTimber-Plugin').projectDir = file('UltimateTimber/Plugin') From e8ef575d2a67097c011f88671ddbe0627526bc63 Mon Sep 17 00:00:00 2001 From: Esophose Date: Wed, 21 Aug 2019 15:27:31 -0600 Subject: [PATCH 2/4] Actually register the hook --- UltimateTimber/Plugin/build.gradle | 1 + .../java/com/songoda/ultimatetimber/manager/HookManager.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/UltimateTimber/Plugin/build.gradle b/UltimateTimber/Plugin/build.gradle index e0b4c98..fab03e0 100644 --- a/UltimateTimber/Plugin/build.gradle +++ b/UltimateTimber/Plugin/build.gradle @@ -13,6 +13,7 @@ dependencies { compile project(':UltimateTimber-McMMOClassic13') compile project(':UltimateTimber-McMMOClassic12') compile project(':UltimateTimber-McMMOClassic8') + compile project(':UltimateTimber-CoreProtect') compileOnly 'org.spigotmc:spigot:1.14.4' extraLibs 'com.songoda:songodaupdater:1' diff --git a/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java index cd212fa..9d40381 100644 --- a/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java +++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java @@ -2,6 +2,7 @@ package com.songoda.ultimatetimber.manager; import com.songoda.ultimatetimber.UltimateTimber; import com.songoda.ultimatetimber.adapter.VersionAdapterType; +import com.songoda.ultimatetimber.hook.CoreProtectHook; import com.songoda.ultimatetimber.hook.JobsHook; import com.songoda.ultimatetimber.hook.McMMOClassic12Hook; import com.songoda.ultimatetimber.hook.McMMOClassic13Hook; @@ -32,6 +33,7 @@ public class HookManager extends Manager { this.hooks.clear(); this.tryHook("Jobs", JobsHook.class); + this.tryHook("CoreProtect", CoreProtectHook.class); if (this.ultimateTimber.getVersionAdapter().getVersionAdapterType().equals(VersionAdapterType.CURRENT)) { Plugin mcMMO = Bukkit.getPluginManager().getPlugin("mcMMO"); From 588f2106980651fcb68990828527024b7c62090a Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 Nov 2019 15:46:17 -0500 Subject: [PATCH 3/4] Removed unused imports --- .../com/songoda/ultimatetimber/hook/CoreProtectHook.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java b/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java index 050444d..60c57ae 100644 --- a/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java +++ b/UltimateTimber-Hook/CoreProtect/src/main/java/com/songoda/ultimatetimber/hook/CoreProtectHook.java @@ -1,18 +1,13 @@ package com.songoda.ultimatetimber.hook; import com.songoda.ultimatetimber.tree.ITreeBlock; -import com.songoda.ultimatetimber.tree.TreeBlock; import com.songoda.ultimatetimber.tree.TreeBlockSet; import com.songoda.ultimatetimber.utils.NMSUtil; import net.coreprotect.CoreProtect; import net.coreprotect.CoreProtectAPI; -import org.bukkit.GameMode; import org.bukkit.block.Block; -import org.bukkit.block.BlockState; import org.bukkit.entity.Player; -import java.util.ArrayList; - public class CoreProtectHook implements TimberHook { private CoreProtectAPI api; From bcde04159dda3daf3dccec9e61b91e2102463d15 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 Nov 2019 15:46:24 -0500 Subject: [PATCH 4/4] version 2.0.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e45d5f5..f262d3e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ allprojects { apply plugin: 'java' group = 'com.songoda.ultimatetimber' - version = '2.0.2' + version = '2.0.3' } subprojects {