From 7bbcdf113f1f4f42869040490ff820a0f4a38a35 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Wed, 28 Feb 2024 01:49:22 +0800 Subject: [PATCH] use new lib --- plugin/build.gradle.kts | 5 +++-- .../momirealms/customcrops/CustomCrops.java | 14 ++++++++++--- .../customplugin/PlatformManager.java | 20 +++++++++---------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 5b6516b..3fe61fd 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -27,9 +27,10 @@ dependencies { implementation("net.kyori:adventure-platform-bukkit:4.3.2") implementation("net.kyori:adventure-text-minimessage:4.15.0") implementation("net.kyori:adventure-text-serializer-legacy:4.15.0") + implementation("com.github.Xiao-MoMi:AntiGriefLib:0.4") implementation("de.tr7zw:item-nbt-api:2.12.2") implementation("org.bstats:bstats-bukkit:3.0.2") - implementation(files("libs/BiomeAPI.jar", "libs/ProtectionLib.jar")) + implementation(files("libs/BiomeAPI.jar")) } tasks { @@ -39,6 +40,6 @@ tasks { relocate ("net.kyori", "net.momirealms.customcrops.libraries") relocate ("org.bstats", "net.momirealms.customcrops.libraries.bstats") relocate ("net.momirealms.biomeapi", "net.momirealms.customcrops.libraries.biomeapi") - relocate ("net.momirealms.protectionlib", "net.momirealms.customcrops.libraries.protectionlib") + relocate ("net.momirealms.antigrieflib", "net.momirealms.customcrops.libraries.antigrieflib") } } diff --git a/plugin/src/main/java/net/momirealms/customcrops/CustomCrops.java b/plugin/src/main/java/net/momirealms/customcrops/CustomCrops.java index d31ec5e..eb2d8ce 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/CustomCrops.java +++ b/plugin/src/main/java/net/momirealms/customcrops/CustomCrops.java @@ -20,6 +20,7 @@ package net.momirealms.customcrops; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; import net.kyori.adventure.platform.bukkit.BukkitAudiences; +import net.momirealms.antigrieflib.AntiGriefLib; import net.momirealms.customcrops.api.CustomCropsAPIImpl; import net.momirealms.customcrops.api.CustomCropsPlugin; import net.momirealms.customcrops.api.object.basic.ConfigManager; @@ -43,7 +44,6 @@ import net.momirealms.customcrops.helper.LibraryLoader; import net.momirealms.customcrops.helper.VersionHelper; import net.momirealms.customcrops.integration.IntegrationManager; import net.momirealms.customcrops.util.AdventureUtils; -import net.momirealms.protectionlib.ProtectionLib; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.World; @@ -73,13 +73,16 @@ public final class CustomCrops extends CustomCropsPlugin { private HologramManager hologramManager; private VersionHelper versionHelper; private Scheduler scheduler; + private AntiGriefLib antiGriefLib; @Override public void onLoad(){ plugin = this; instance = this; this.loadLibs(); - ProtectionLib.initialize(this); + this.antiGriefLib = AntiGriefLib.builder(this) + .ignoreOP(true) + .build(); } @Override @@ -100,7 +103,6 @@ public final class CustomCrops extends CustomCropsPlugin { if (!this.loadPlatform()) return; this.registerCommands(); AdventureUtils.consoleMessage("[CustomCrops] Running on " + Bukkit.getVersion()); - ProtectionLib.hook(); this.scheduler = new Scheduler(this); this.configManager = new ConfigManager(this); @@ -126,6 +128,8 @@ public final class CustomCrops extends CustomCropsPlugin { AdventureUtils.consoleMessage("[CustomCrops] Plugin Enabled!"); if (ConfigManager.enableBStats) new Metrics(this, 16593); if (ConfigManager.checkUpdate) this.versionHelper.checkUpdate(); + + antiGriefLib.init(); } public void reload() { @@ -290,4 +294,8 @@ public final class CustomCrops extends CustomCropsPlugin { public Scheduler getScheduler() { return scheduler; } + + public AntiGriefLib getAntiGriefLib() { + return antiGriefLib; + } } diff --git a/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java b/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java index 1e333af..715ddc9 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java @@ -44,10 +44,8 @@ import net.momirealms.customcrops.api.object.wateringcan.WateringCanConfig; import net.momirealms.customcrops.api.object.world.SimpleLocation; import net.momirealms.customcrops.customplugin.itemsadder.ItemsAdderHandler; import net.momirealms.customcrops.customplugin.oraxen.OraxenHandler; -import net.momirealms.customcrops.helper.Log; import net.momirealms.customcrops.util.AdventureUtils; import net.momirealms.customcrops.util.RotationUtils; -import net.momirealms.protectionlib.ProtectionLib; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -402,7 +400,7 @@ public class PlatformManager extends Function { return false; } - if (!ProtectionLib.canPlace(player, location)) { + if (!plugin.getAntiGriefLib().canPlace(player, location)) { return true; } @@ -530,7 +528,7 @@ public class PlatformManager extends Function { return true; } - if (!ProtectionLib.canPlace(player, location)) { + if (!plugin.getAntiGriefLib().canPlace(player, location)) { return true; } @@ -567,7 +565,7 @@ public class PlatformManager extends Function { return true; } - if (!ProtectionLib.canBreak(player, location)) { + if (!plugin.getAntiGriefLib().canBreak(player, location)) { return true; } @@ -678,9 +676,9 @@ public class PlatformManager extends Function { if (inAc != null) { for (Action action : inAc) { action.doOn( - player, - SimpleLocation.getByBukkitLocation(location), - cropConfig.getCropMode() + player, + SimpleLocation.getByBukkitLocation(location), + cropConfig.getCropMode() ); } } @@ -700,7 +698,7 @@ public class PlatformManager extends Function { if (potConfig == null) return false; - if (!ProtectionLib.canPlace(player, location)) + if (!plugin.getAntiGriefLib().canPlace(player, location)) return true; PotInteractEvent potInteractEvent = new PotInteractEvent(player, item_in_hand, location, pot_id); @@ -1065,7 +1063,7 @@ public class PlatformManager extends Function { outer: { if (id != null && location != null) { - if (!ProtectionLib.canPlace(player, location)) + if (!plugin.getAntiGriefLib().canPlace(player, location)) return true; if (!wateringCanConfig.canUse(player, location)) return true; @@ -1099,7 +1097,7 @@ public class PlatformManager extends Function { for (String blockId : blockIds) { if (positiveFillMethod.getId().equals(blockId)) { Block block = lineOfSight.get(index); - if (!ProtectionLib.canPlace(player, block.getLocation())) + if (!plugin.getAntiGriefLib().canPlace(player, block.getLocation())) return true; if (!wateringCanConfig.canUse(player, location)) return true;