From b9b40197714de3025316993477ecc8c57f024de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petulikan=20D=C3=A1lnev=C3=ADm?= Date: Tue, 17 Dec 2024 18:10:14 +0100 Subject: [PATCH] 4.18 --- build.gradle.kts | 14 +++++++------- buildSrc/build.gradle.kts | 2 +- ...t.wolfyutils.spigot.java-conventions.gradle.kts | 3 ++- gradle.properties | 2 +- plugin-compatibility/build.gradle.kts | 9 ++++----- .../executableblocks/ExecutableBlocksImpl.java | 2 +- .../executableitems/ExecutableItemsRef.java | 1 - .../plugins/fancybags/FancyBagsImpl.java | 8 ++++++-- .../plugins/fancybags/FancyBagsItemsRef.java | 2 ++ .../fancybags/FancyBagsStackIdentifier.java | 2 ++ .../plugins/mythicmobs/MythicMobsImpl.java | 8 ++++---- .../plugins/mythicmobs/MythicMobsRefImpl.java | 6 +++--- settings.gradle.kts | 2 +- 13 files changed, 34 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cae86049..26ef790f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("com.wolfyscript.wolfyutils.spigot.java-conventions") id("io.github.goooler.shadow") version "8.1.7" - id("com.wolfyscript.devtools.docker.run") version "2.0-SNAPSHOT" - id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT" + //id("com.wolfyscript.devtools.docker.run") version "2.0-SNAPSHOT" + //id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT" } description = "wolfyutils-spigot" @@ -38,9 +38,9 @@ tasks.named("processResources") { duplicatesStrategy = DuplicatesStrategy.INCLUDE } -val debugPort: String = "5006" +//val debugPort: String = "5006" -minecraftDockerRun { +/*minecraftDockerRun { // clean.set(false) val customEnv = env.get().toMutableMap() customEnv["MEMORY"] = "2G" @@ -48,9 +48,9 @@ minecraftDockerRun { customEnv["FORCE_REDOWNLOAD"] = "false" env.set(customEnv) arguments("--cpus", "2", "-it") // Constrain to only use 2 cpus, and allow for console interactivity with 'docker attach' -} +}*/ -minecraftServers { +/*minecraftServers { serversDir.set(file("${System.getProperty("user.home")}${File.separator}minecraft${File.separator}test_servers_v4")) libName.set("${project.name}-${version}.jar") val debugPortMapping = "${debugPort}:${debugPort}" @@ -105,7 +105,7 @@ minecraftServers { ports.set(setOf(debugPortMapping, "25571:25565")) } } -} +}*/ tasks.named("shadowJar") { dependsOn(project(":nmsutil").tasks.named("shadowJar")) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c041d87d..534875b7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,7 +11,7 @@ repositories { dependencies { implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0") - implementation(group = "io.papermc.paperweight", name = "paperweight-userdev", version = "1.7.1") + implementation(group = "io.papermc.paperweight", name = "paperweight-userdev", version = "1.7.6") } gradlePlugin { diff --git a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts index bc27bbee..e06a971d 100644 --- a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts @@ -18,13 +18,14 @@ repositories { maven(url = "https://nexus.phoenixdevt.fr/repository/maven-public/") maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/") maven(url = "https://libraries.minecraft.net/") + maven(url="https://mvn.lumine.io/repository/maven-public/") maven("https://repo.auxilor.io/repository/maven-public/") } java { // Configure the java toolchain. This allows gradle to auto-provision JDK 17 on systems that only have JDK 8 installed for example. - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } val apiVersion = "4.16.1-SNAPSHOT" diff --git a/gradle.properties b/gradle.properties index b0c94abb..8d6d1278 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.wolfyscript.wolfyutils.spigot -version=4.17-beta.7 +version=4.18-petu diff --git a/plugin-compatibility/build.gradle.kts b/plugin-compatibility/build.gradle.kts index 9f065c56..44f5f8ca 100644 --- a/plugin-compatibility/build.gradle.kts +++ b/plugin-compatibility/build.gradle.kts @@ -3,19 +3,18 @@ plugins { } dependencies { - compileOnly("com.ssomar:SCore:4.0.1") - compileOnly("com.ssomar.executableblocks:ExecutableBlocks:4.0.1") + compileOnly("com.ssomar.score:SCore:4.24.4.15") + compileOnly("com.ssomar.executableblocks:ExecutableBlocks:4.24.4.15") compileOnly("com.denizenscript:denizen:1.2.5-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.1") compileOnly("com.willfp:eco:6.74.2") compileOnly("com.github.LoneDev6:api-itemsadder:3.1.5") compileOnly("com.elmakers.mine.bukkit:MagicAPI:10.2") - compileOnly("com.github.AlessioGr:FancyBags:2.7.0") +/* compileOnly("com.github.AlessioGr:FancyBags:2.7.0")*/ compileOnly("com.github.oraxen:oraxen:1.152.0") compileOnly("io.lumine:MythicLib:1.1.5") compileOnly("net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT") - compileOnly("io.lumine.xikage:MythicMobs:4.12.0") - compileOnly("io.lumine.mythic.mythicmobs:MythicMobs-Bukkit:5.0.1") + compileOnly("io.lumine:Mythic-Dist:5.6.1") compileOnly("com.google.inject:guice:5.1.0") compileOnly(project(":core")) } diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java index bb7926c2..ace3a463 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java @@ -43,7 +43,7 @@ public boolean isValidID(String id) { @Override public List getExecutableBlockIdsList() { - return manager.getExecutableBlockIdsList(); + return manager.getLoadedObjectsIDs(); } @Override diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableitems/ExecutableItemsRef.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableitems/ExecutableItemsRef.java index 39311ede..34f4b95b 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableitems/ExecutableItemsRef.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableitems/ExecutableItemsRef.java @@ -7,7 +7,6 @@ import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.compatibility.plugins.ExecutableItemsIntegration; -import me.wolfyscript.utilities.compatibility.plugins.executableblocks.ExecutableBlocksStackIdentifier; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsImpl.java index cbfa4131..4e512d9b 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsImpl.java @@ -1,3 +1,4 @@ +/* package me.wolfyscript.utilities.compatibility.plugins.fancybags; import me.wolfyscript.utilities.annotations.WUPluginIntegration; @@ -10,11 +11,13 @@ public class FancyBagsImpl extends PluginIntegrationAbstract { public static final String KEY = "FancyBags"; - /** + */ +/** * The main constructor that is called whenever the integration is created.
* * @param core The WolfyUtilCore. - */ + *//* + protected FancyBagsImpl(WolfyUtilCore core) { super(core, KEY); } @@ -31,3 +34,4 @@ public boolean hasAsyncLoading() { return false; } } +*/ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsItemsRef.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsItemsRef.java index 0c7ee7d1..e794f9ec 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsItemsRef.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsItemsRef.java @@ -1,3 +1,4 @@ +/* package me.wolfyscript.utilities.compatibility.plugins.fancybags; import com.fasterxml.jackson.core.JsonGenerator; @@ -82,3 +83,4 @@ public Parser() { } } } +*/ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsStackIdentifier.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsStackIdentifier.java index 1c2d447c..cc2664c7 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsStackIdentifier.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/fancybags/FancyBagsStackIdentifier.java @@ -1,3 +1,4 @@ +/* package me.wolfyscript.utilities.compatibility.plugins.fancybags; import com.fasterxml.jackson.annotation.JsonCreator; @@ -106,3 +107,4 @@ public Optional from(JsonNode legacyData) { } } +*/ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsImpl.java index 30cd0e47..eb14e886 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsImpl.java @@ -18,9 +18,9 @@ package me.wolfyscript.utilities.compatibility.plugins.mythicmobs; -import io.lumine.xikage.mythicmobs.MythicMobs; -import io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitAdapter; -import io.lumine.xikage.mythicmobs.mobs.MythicMob; +import io.lumine.mythic.api.mobs.MythicMob; +import io.lumine.mythic.bukkit.BukkitAdapter; +import io.lumine.mythic.bukkit.MythicBukkit; import me.wolfyscript.utilities.annotations.WUPluginIntegration; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.WolfyUtilities; @@ -60,7 +60,7 @@ public boolean isAPIReferenceIncluded(APIReference reference) { @Override public void spawnMob(String mobName, Location location, int mobLevel) { - MythicMob mythicMob = MythicMobs.inst().getMobManager().getMythicMob(mobName); + MythicMob mythicMob = MythicBukkit.inst().getMobManager().getMythicMob(mobName).orElse(null); if(mythicMob != null) { mythicMob.spawn(BukkitAdapter.adapt(location), mobLevel); } diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsRefImpl.java index 60ad4d85..46eaf9ff 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsRefImpl.java @@ -19,7 +19,7 @@ package me.wolfyscript.utilities.compatibility.plugins.mythicmobs; import com.fasterxml.jackson.databind.JsonNode; -import io.lumine.xikage.mythicmobs.MythicMobs; +import io.lumine.mythic.bukkit.MythicBukkit; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; @@ -44,7 +44,7 @@ public MythicMobsRefImpl(MythicMobsRefImpl mythicMobsRefImpl) { @Override public ItemStack getLinkedItem() { - return MythicMobs.inst().getItemManager().getItemStack(itemName); + return MythicBukkit.inst().getItemManager().getItemStack(itemName); } @Override @@ -56,7 +56,7 @@ public static class Parser extends AbstractMythicMobsRef.Parser