From da68bd67937d1f7a0372774f7a6838a108a0cbf7 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Thu, 29 Feb 2024 01:35:15 +0800 Subject: [PATCH] 3.3.1.16 --- build.gradle.kts | 2 +- plugin/build.gradle.kts | 2 +- .../api/object/loot/QualityLoot.java | 2 - .../customplugin/PlatformManager.java | 44 ++++++++----------- .../customplugin/oraxen/OraxenPluginImpl.java | 1 - .../season/AdvancedSeasonsImpl.java | 1 - 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7d8a63d..0c162f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { project.group = "net.momirealms" - project.version = "3.3.1.14" + project.version = "3.3.1.16" apply() apply(plugin = "java") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index e82b983..163308a 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -27,7 +27,7 @@ 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.6") + implementation("com.github.Xiao-MoMi:AntiGriefLib:0.7") implementation("de.tr7zw:item-nbt-api:2.12.2") implementation("org.bstats:bstats-bukkit:3.0.2") implementation(files("libs/BiomeAPI.jar")) diff --git a/plugin/src/main/java/net/momirealms/customcrops/api/object/loot/QualityLoot.java b/plugin/src/main/java/net/momirealms/customcrops/api/object/loot/QualityLoot.java index b878e35..e7638ac 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/api/object/loot/QualityLoot.java +++ b/plugin/src/main/java/net/momirealms/customcrops/api/object/loot/QualityLoot.java @@ -30,8 +30,6 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import java.util.List; - public class QualityLoot extends Loot { private final String[] qualityLoots; 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 715ddc9..70cf144 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/customplugin/PlatformManager.java @@ -1081,34 +1081,26 @@ public class PlatformManager extends Function { } } - List lineOfSight = player.getLineOfSight(null, 5); - List blockIds = lineOfSight.stream().map(block -> { - if (block == null) { - return "AIR"; - } - if (block.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) { - return "WATER"; - } - return plugin.getPlatformInterface().getBlockID(block); - }).toList(); + Block targetBlock = player.getTargetBlockExact(5, FluidCollisionMode.ALWAYS); + if (targetBlock == null) + return true; + String blockId = plugin.getPlatformInterface().getBlockID(targetBlock); + if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) { + blockId = "WATER"; + } for (PositiveFillMethod positiveFillMethod : wateringCanConfig.getPositiveFillMethods()) { - int index = 0; - for (String blockId : blockIds) { - if (positiveFillMethod.getId().equals(blockId)) { - Block block = lineOfSight.get(index); - if (!plugin.getAntiGriefLib().canPlace(player, block.getLocation())) - return true; - if (!wateringCanConfig.canUse(player, location)) - return true; - add = positiveFillMethod.getAmount(); - if (positiveFillMethod.getSound() != null) - AdventureUtils.playerSound(player, positiveFillMethod.getSound()); - if (positiveFillMethod.getParticle() != null) - block.getWorld().spawnParticle(positiveFillMethod.getParticle(), block.getLocation().add(0.5,1.1, 0.5),5,0.1,0.1,0.1); - break; - } - index++; + if (positiveFillMethod.getId().equals(blockId)) { + if (!plugin.getAntiGriefLib().canPlace(player, targetBlock.getLocation())) + return true; + if (!wateringCanConfig.canUse(player, location)) + return true; + add = positiveFillMethod.getAmount(); + if (positiveFillMethod.getSound() != null) + AdventureUtils.playerSound(player, positiveFillMethod.getSound()); + if (positiveFillMethod.getParticle() != null) + targetBlock.getWorld().spawnParticle(positiveFillMethod.getParticle(), targetBlock.getLocation().add(0.5,1.1, 0.5),5,0.1,0.1,0.1); + break; } } } diff --git a/plugin/src/main/java/net/momirealms/customcrops/customplugin/oraxen/OraxenPluginImpl.java b/plugin/src/main/java/net/momirealms/customcrops/customplugin/oraxen/OraxenPluginImpl.java index e6c592f..a95d84d 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/customplugin/oraxen/OraxenPluginImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/customplugin/oraxen/OraxenPluginImpl.java @@ -22,7 +22,6 @@ import de.tr7zw.changeme.nbtapi.NBTItem; import io.th0rgal.oraxen.api.OraxenBlocks; import io.th0rgal.oraxen.api.OraxenFurniture; import io.th0rgal.oraxen.api.OraxenItems; -import io.th0rgal.oraxen.api.events.furniture.OraxenFurnitureInteractEvent; import io.th0rgal.oraxen.items.ItemBuilder; import io.th0rgal.oraxen.mechanics.Mechanic; import io.th0rgal.oraxen.mechanics.provided.gameplay.block.BlockMechanic; diff --git a/plugin/src/main/java/net/momirealms/customcrops/integration/season/AdvancedSeasonsImpl.java b/plugin/src/main/java/net/momirealms/customcrops/integration/season/AdvancedSeasonsImpl.java index 67cc411..01309dd 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/integration/season/AdvancedSeasonsImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/integration/season/AdvancedSeasonsImpl.java @@ -20,7 +20,6 @@ package net.momirealms.customcrops.integration.season; import me.casperge.realisticseasons.api.SeasonsAPI; import net.advancedplugins.seasons.api.AdvancedSeasonsAPI; import net.momirealms.customcrops.api.object.season.CCSeason; -import net.momirealms.customcrops.helper.Log; import net.momirealms.customcrops.integration.SeasonInterface; import org.bukkit.Bukkit;