From 518ad34045d6c66d131dc957c95c4c0679479cbc Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Sun, 28 Jan 2024 20:52:10 +0800 Subject: [PATCH] 3.0.11 --- build.gradle.kts | 2 +- plugin/build.gradle.kts | 7 +- .../api/object/world/SlimeWorldListener.java | 82 +++++++++---------- .../api/object/world/WorldDataManager.java | 8 -- .../customplugin/oraxen/OraxenPluginImpl.java | 3 +- 5 files changed, 47 insertions(+), 55 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 09bce96..2f63b17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { project.group = "net.momirealms" - project.version = "3.3.1.10" + project.version = "3.3.1.11" apply() apply(plugin = "java") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 4bc39a1..5b6516b 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,18 +1,17 @@ dependencies { compileOnly(fileTree("libs")) - compileOnly("me.clip:placeholderapi:2.11.3") + compileOnly("me.clip:placeholderapi:2.11.5") compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") compileOnly("dev.dejvokep:boosted-yaml:1.3.1") compileOnly("commons-io:commons-io:2.11.0") compileOnly("com.google.code.gson:gson:2.10.1") compileOnly("com.github.LoneDev6:api-itemsadder:3.4.1e") - compileOnly("com.github.oraxen:oraxen:1.158.0") + compileOnly("com.github.oraxen:oraxen:1.168.0") compileOnly("io.lumine:Mythic-Dist:5.2.1") compileOnly("io.lumine:MythicLib-dist:1.6-SNAPSHOT") compileOnly("com.willfp:eco:6.65.1") compileOnly("com.willfp:EcoJobs:3.13.0") compileOnly("net.objecthunter:exp4j:0.4.8") - compileOnly("com.infernalsuite.aswm:api:1.19.4-R0.1-SNAPSHOT") compileOnly("net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT") compileOnly("pers.neige.neigeitems:NeigeItems:1.14.23") compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21") @@ -25,7 +24,7 @@ dependencies { implementation(project(":api")) implementation("net.kyori:adventure-api:4.15.0") - implementation("net.kyori:adventure-platform-bukkit:4.3.3-SNAPSHOT") + 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("de.tr7zw:item-nbt-api:2.12.2") diff --git a/plugin/src/main/java/net/momirealms/customcrops/api/object/world/SlimeWorldListener.java b/plugin/src/main/java/net/momirealms/customcrops/api/object/world/SlimeWorldListener.java index 39fe752..aa4a1db 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/api/object/world/SlimeWorldListener.java +++ b/plugin/src/main/java/net/momirealms/customcrops/api/object/world/SlimeWorldListener.java @@ -1,41 +1,41 @@ -/* - * Copyright (C) <2022> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.momirealms.customcrops.api.object.world; - -import com.infernalsuite.aswm.api.events.LoadSlimeWorldEvent; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; - -public class SlimeWorldListener implements Listener { - - private final WorldDataManager worldDataManager; - - public SlimeWorldListener(WorldDataManager worldDataManager) { - this.worldDataManager = worldDataManager; - } - - @EventHandler - public void onWorldLoad(LoadSlimeWorldEvent event) { - World world = Bukkit.getWorld(event.getSlimeWorld().getName()); - if (world != null) { - worldDataManager.loadWorld(world); - } - } -} +///* +// * Copyright (C) <2022> +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see . +// */ +// +//package net.momirealms.customcrops.api.object.world; +// +//import com.infernalsuite.aswm.api.events.LoadSlimeWorldEvent; +//import org.bukkit.Bukkit; +//import org.bukkit.World; +//import org.bukkit.event.EventHandler; +//import org.bukkit.event.Listener; +// +//public class SlimeWorldListener implements Listener { +// +// private final WorldDataManager worldDataManager; +// +// public SlimeWorldListener(WorldDataManager worldDataManager) { +// this.worldDataManager = worldDataManager; +// } +// +// @EventHandler +// public void onWorldLoad(LoadSlimeWorldEvent event) { +// World world = Bukkit.getWorld(event.getSlimeWorld().getName()); +// if (world != null) { +// worldDataManager.loadWorld(world); +// } +// } +//} diff --git a/plugin/src/main/java/net/momirealms/customcrops/api/object/world/WorldDataManager.java b/plugin/src/main/java/net/momirealms/customcrops/api/object/world/WorldDataManager.java index 7678b51..d417548 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/api/object/world/WorldDataManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/api/object/world/WorldDataManager.java @@ -40,23 +40,16 @@ public class WorldDataManager extends Function { private final ConcurrentHashMap worldMap; private final CustomCrops plugin; private final WorldListener worldListener; - private SlimeWorldListener slimeWorldListener; public WorldDataManager(CustomCrops plugin) { this.plugin = plugin; this.worldMap = new ConcurrentHashMap<>(); this.worldListener = new WorldListener(this); - try { - Class.forName("com.infernalsuite.aswm.api.world.SlimeWorld"); - this.slimeWorldListener = new SlimeWorldListener(this); - } catch (ClassNotFoundException ignored) { - } } @Override public void load() { Bukkit.getPluginManager().registerEvents(worldListener, plugin); - if (slimeWorldListener != null) Bukkit.getPluginManager().registerEvents(slimeWorldListener, plugin); for (CCWorld ccWorld : worldMap.values()) { ccWorld.load(); } @@ -65,7 +58,6 @@ public class WorldDataManager extends Function { @Override public void unload() { HandlerList.unregisterAll(worldListener); - if (slimeWorldListener != null) HandlerList.unregisterAll(slimeWorldListener); for (CCWorld ccWorld : worldMap.values()) { ccWorld.unload(); } 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 d691296..d6a2999 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,6 +22,7 @@ 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; @@ -73,7 +74,7 @@ public class OraxenPluginImpl implements PlatformInterface { AdventureUtils.consoleMessage("[CustomCrops] Furniture not exists: " + id); return null; } - Entity entity = mechanic.place(location, 0, BlockFace.UP); + Entity entity = mechanic.place(location, 0f, BlockFace.UP); if (entity instanceof ItemFrame itemFrame) return itemFrame; else {