Merge branch 'main' into Development

Author: NextdoorPsycho

build.gradle

@@ -23,7 +23,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '1.12.1-1.20.1'
+version '1.12.3-1.20.1'
 def nmsVersion = "1.20.1" //[NMS]
 def apiVersion = '1.20'
 def specialSourceVersion = '1.11.0' //[NMS]
@@ -134,12 +134,12 @@ dependencies {
     //Random Api's
     implementation 'com.github.DeadSilenceIV:AdvancedChestsAPI:2.9-BETA'
     implementation 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
-    implementation "com.github.FrancoBM12:API-MagicCosmetics:1.9.85"
+    implementation "com.github.FrancoBM12:API-MagicCosmetics:2.2.2"
     implementation 'me.clip:placeholderapi:2.11.2'
     implementation 'com.github.LoneDev6:api-itemsadder:3.2.5'
     implementation 'io.th0rgal:oraxen:1.94.0'
     implementation 'com.massivecraft:Factions:1.6.9.5-U0.6.21'
-    implementation "com.github.angeschossen:ChestProtectAPI:3.6.0"
+    implementation "com.github.angeschossen:ChestProtectAPI:3.9.1"
     implementation "com.github.TechFortress:GriefPrevention:16.18.1"
     implementation 'xyz.xenondevs:particle:1.8.1'
     compileOnly 'com.griefdefender:api:2.1.0-SNAPSHOT'
@@ -154,6 +154,7 @@ dependencies {
     compileOnly 'net.kyori:adventure-api:4.13.1'
     compileOnly 'io.github.mqzn:mCommands-spigot:1.1.0'
     compileOnly 'io.github.mqzn:mCommands-common:1.1.0'
+    implementation 'com.google.guava:guava:30.1-jre'
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 }
 

libs/LockettePro-2.11.1.jar

@@ -142,6 +142,9 @@ public void start() {
         if (getServer().getPluginManager().getPlugin("GriefPrevention") != null) {
             protectorRegistry.registerProtector(new GriefPreventionProtector());
         }
+        if (getServer().getPluginManager().getPlugin("LockettePro") != null) {
+            protectorRegistry.registerProtector(new LocketteProProtector());
+        }
         glowingEntities = new GlowingEntities(this);
         parser.parse(new CommandAdapt());
     }

src/main/java/com/volmit/adapt/Adapt.java

@@ -115,6 +115,7 @@ public static class Protector {
         private boolean residence = true;
         private boolean chestProtect = true;
         private boolean griefprevention = true;
+        private boolean lockettePro = true;
     }
 
 

src/main/java/com/volmit/adapt/AdaptConfig.java

@@ -5,7 +5,7 @@
 import com.volmit.adapt.api.adaptation.Adaptation;
 import com.volmit.adapt.api.protection.Protector;
 import me.angeschossen.chestprotect.api.addons.ChestProtectAddon;
-import me.angeschossen.chestprotect.api.objects.BlockProtection;
+import me.angeschossen.chestprotect.api.protection.block.BlockProtection;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 

src/main/java/com/volmit/adapt/content/protector/ChestProtectProtector.java

@@ -0,0 +1,28 @@
+package com.volmit.adapt.content.protector;
+
+import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
+import com.volmit.adapt.api.adaptation.Adaptation;
+import com.volmit.adapt.api.protection.Protector;
+import me.angeschossen.chestprotect.api.addons.ChestProtectAddon;
+import me.angeschossen.chestprotect.api.protection.block.BlockProtection;
+import me.crafter.mc.lockettepro.LocketteProAPI;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public class LocketteProProtector implements Protector {
+    @Override
+    public boolean canAccessChest(Player player, Location chestlocation, Adaptation<?> adaptation) {
+        return LocketteProAPI.isOwner(chestlocation.getBlock(), player);
+    }
+
+    @Override
+    public String getName() {
+        return "LockettePro";
+    }
+
+    @Override
+    public boolean isEnabledByDefault() {
+        return AdaptConfig.get().getProtectorSupport().isLockettePro();
+    }
+}