Skip to content

Commit

Permalink
4.18
Browse files Browse the repository at this point in the history
  • Loading branch information
petulikan1 committed Dec 17, 2024
1 parent c256534 commit b9b4019
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 27 deletions.
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -38,19 +38,19 @@ tasks.named<ProcessResources>("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"
customEnv["JVM_OPTS"] = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${debugPort}"
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}"
Expand Down Expand Up @@ -105,7 +105,7 @@ minecraftServers {
ports.set(setOf(debugPortMapping, "25571:25565"))
}
}
}
}*/

tasks.named<ShadowJar>("shadowJar") {
dependsOn(project(":nmsutil").tasks.named("shadowJar"))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=com.wolfyscript.wolfyutils.spigot
version=4.17-beta.7
version=4.18-petu
9 changes: 4 additions & 5 deletions plugin-compatibility/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public boolean isValidID(String id) {

@Override
public List<String> getExecutableBlockIdsList() {
return manager.getExecutableBlockIdsList();
return manager.getLoadedObjectsIDs();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
package me.wolfyscript.utilities.compatibility.plugins.fancybags;
import me.wolfyscript.utilities.annotations.WUPluginIntegration;
Expand All @@ -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.<br>
*
* @param core The WolfyUtilCore.
*/
*//*
protected FancyBagsImpl(WolfyUtilCore core) {
super(core, KEY);
}
Expand All @@ -31,3 +34,4 @@ public boolean hasAsyncLoading() {
return false;
}
}
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
package me.wolfyscript.utilities.compatibility.plugins.fancybags;
import com.fasterxml.jackson.core.JsonGenerator;
Expand Down Expand Up @@ -82,3 +83,4 @@ public Parser() {
}
}
}
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
package me.wolfyscript.utilities.compatibility.plugins.fancybags;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand Down Expand Up @@ -106,3 +107,4 @@ public Optional<FancyBagsStackIdentifier> from(JsonNode legacyData) {
}
}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand All @@ -56,7 +56,7 @@ public static class Parser extends AbstractMythicMobsRef.Parser<MythicMobsRefImp

@Override
protected MythicMobsRefImpl construct(String value) {
if (MythicMobs.inst().getItemManager().getItem(value).isPresent()) {
if (MythicBukkit.inst().getItemManager().getItem(value).isPresent()) {
return new MythicMobsRefImpl(value);
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencyResolutionManagement {
library("fastutil", "it.unimi.dsi", "fastutil").version("8.5.6")
library("typesafe.config", "com.typesafe", "config").version("1.3.1")
library("bstats", "org.bstats", "bstats-bukkit").version("3.0.0")
library("nbtapi-api", "de.tr7zw", "item-nbt-api").version("2.13.2")
library("nbtapi-api", "de.tr7zw", "item-nbt-api").version("2.14.0")
}
// Libraries only used for testing
create("testLibs") {
Expand Down

0 comments on commit b9b4019

Please sign in to comment.