Merge remote-tracking branch 'upstream/master' into ver/1.0

Author: Biquaternions

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'pl.norbit'
-version = 'v1.9.2'
+version = 'v2.0.0'
 
 repositories {
     mavenCentral()
@@ -28,6 +28,7 @@ repositories {
 
 dependencies {
     compileOnly "io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT"
+    compileOnly files('libs/CoreProtect-CE-23.0.jar')
     //bstats
     implementation 'org.bstats:bstats-bukkit:3.1.0'
     //glowing

libs/CoreProtect-CE-23.0.jar

@@ -12,6 +12,7 @@
 import pl.norbit.treecuter.listeners.TreeListeners;
 import pl.norbit.treecuter.listeners.UnglowListener;
 import pl.norbit.treecuter.placeholders.PlaceholderRegistry;
+import pl.norbit.treecuter.service.CoreProtectService;
 import pl.norbit.treecuter.service.EffectService;
 import pl.norbit.treecuter.service.LeafDecayService;
 import pl.norbit.treecuter.service.TreeCutService;
@@ -32,6 +33,7 @@ public void onEnable() {
         EffectService.start();
         TreeCutService.start();
         LeafDecayService.start();
+        CoreProtectService.load();
 
         infoMessage();
         checkPlugins();

src/main/java/pl/norbit/treecuter/TreeCuter.java

@@ -64,13 +64,6 @@ private void get(CommandSender sender, String key){
                     p.getInventory().addItem(customTool);
                     p.sendMessage(ChatUtils.format(Settings.getToolGet()));
                 }, () -> p.sendMessage(ChatUtils.format(Settings.getToolNotFound())));
-
-
-//        var item = ItemsUtils.getItem();
-//
-//        p.getInventory().addItem(item);
-//
-//        p.sendMessage(ChatUtils.format(Settings.getToolGet()));
     }
 
     private void toggle(CommandSender sender){

src/main/java/pl/norbit/treecuter/commands/TreeCuterCommand.java

@@ -4,10 +4,8 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.block.Block;
-import org.bukkit.block.Lidded;
 
 import java.util.List;
-import java.util.Set;
 
 @Getter
 @AllArgsConstructor

src/main/java/pl/norbit/treecuter/model/GlowBlock.java

@@ -30,7 +30,12 @@ public boolean persist() {
 
     @Override
     public String onRequest(OfflinePlayer player, String params) {
-        if (params.contains("toggle")) {
+        if (params.contains("toggle_raw")) {
+            if(!ToggleService.getToggle(player.getUniqueId())){
+                return  "false";
+            }
+            return "true";
+        }else if (params.contains("toggle")) {
             if(!ToggleService.getToggle(player.getUniqueId())){
                 return ChatUtils.format(Settings.getPlaceholderToggleOff());
             }

src/main/java/pl/norbit/treecuter/placeholders/PlaceholderRegistry.java

@@ -0,0 +1,24 @@
+package pl.norbit.treecuter.service;
+
+import net.coreprotect.CoreProtectAPI;
+import org.bukkit.block.BlockState;
+import pl.norbit.treecuter.utils.CoreProtectUtils;
+
+public class CoreProtectService {
+    private static CoreProtectAPI coreProtectAPI;
+
+    private CoreProtectService() {
+        throw new IllegalStateException("This class cannot be instantiated");
+    }
+
+    public static void load(){
+        coreProtectAPI = CoreProtectUtils.getCoreProtect();
+    }
+
+    public static void logBreak(String playerName, BlockState blockState) {
+        if(coreProtectAPI == null){
+            return;
+        }
+        coreProtectAPI.logRemoval(playerName, blockState);
+    }
+}

src/main/java/pl/norbit/treecuter/service/CoreProtectService.java

@@ -46,6 +46,8 @@ private static void breakBlock(Block b){
         }
 
         if (b.getType() != Material.AIR) {
+            //log block break to CoreProtect
+            CoreProtectService.logBreak("TreeCutter-decay", b.getState());
             b.breakNaturally();
         }
     }

src/main/java/pl/norbit/treecuter/service/LeafDecayService.java

@@ -201,19 +201,20 @@ private static void breakBlock(Player p, Block b){
             return;
         }
 
-        if (Settings.isItemsToInventory()) {
-            Material material = b.getType();
+        Material mat = b.getType();
 
-            if(material == Material.AIR){
-                return;
-            }
+        if(mat == Material.AIR){
+            return;
+        }
+        //log block break to CoreProtect
+        CoreProtectService.logBreak(p.getName(), b.getState());
 
-            p.getInventory().addItem(new ItemStack(material));
+        if (Settings.isItemsToInventory()) {
+            p.getInventory().addItem(new ItemStack(mat));
             b.setType(Material.AIR);
         } else b.breakNaturally();
     }
 
-
     private static void updateItem(Player p, int durabilityDamage){
         PlayerInventory inventory = p.getInventory();
 

src/main/java/pl/norbit/treecuter/service/TreeCutService.java

@@ -0,0 +1,35 @@
+package pl.norbit.treecuter.utils;
+
+import net.coreprotect.CoreProtect;
+import net.coreprotect.CoreProtectAPI;
+import org.bukkit.plugin.Plugin;
+import pl.norbit.treecuter.TreeCuter;
+
+public class CoreProtectUtils {
+
+    private CoreProtectUtils() {
+        throw new IllegalStateException("This class cannot be instantiated");
+    }
+
+    public static CoreProtectAPI getCoreProtect() {
+        Plugin plugin = TreeCuter.getInstance().getServer().getPluginManager().getPlugin("CoreProtect");
+
+        // Check that CoreProtect is loaded
+        if (!(plugin instanceof CoreProtect)) {
+            return null;
+        }
+
+        // Check that the API is enabled
+        CoreProtectAPI CoreProtect = ((CoreProtect) plugin).getAPI();
+        if (!CoreProtect.isEnabled()) {
+            return null;
+        }
+
+        // Check that a compatible version of the API is loaded
+        if (CoreProtect.APIVersion() < 10) {
+            return null;
+        }
+
+        return CoreProtect;
+    }
+}