From ea3374caacf0a93086bda8e9f4c8df25c4fb92a4 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Wed, 13 Apr 2022 17:23:50 +0100 Subject: [PATCH] Update to Mythic Mobs 5 --- api/build.gradle.kts | 5 ++-- .../rpgregions/utils/RegenUtils.java | 10 +++---- build.gradle.kts | 16 ++-------- rpgregions/build.gradle.kts | 30 +++++++++++-------- 4 files changed, 28 insertions(+), 33 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 793d2f5..7102965 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -7,8 +7,7 @@ dependencies { testImplementation("com.github.seeseemelk:MockBukkit-v1.17:1.13.0") testImplementation("org.reflections:reflections:0.10.2") - implementation("io.papermc:paperlib:1.0.4") // paperlib - async teleport on Paper - + compileOnly("io.papermc:paperlib:1.0.4") // we include paperlib and relocate elsewhere compileOnly("com.github.MilkBowl:VaultAPI:1.7") // vault compileOnly("me.clip:placeholderapi:2.10.4") // PAPI compileOnly(":AlonsoLevels_v2.0-BETA") // alonsolevels @@ -22,7 +21,7 @@ dependencies { exclude("org.bukkit") exclude("org.spigotmc") } - compileOnly("io.lumine.xikage:MythicMobs:4.9.1") { + compileOnly("io.lumine:Mythic-Dist:5.0.3-SNAPSHOT") { exclude("org.apache.commons") } } diff --git a/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java b/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java index e85b6cd..5fe862f 100644 --- a/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java +++ b/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java @@ -16,8 +16,7 @@ import com.sk89q.worldedit.world.World; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import io.lumine.xikage.mythicmobs.MythicMobs; -import io.lumine.xikage.mythicmobs.mobs.MythicMob; +import io.lumine.mythic.bukkit.MythicBukkit; import net.islandearth.rpgregions.api.IRPGRegionsAPI; import net.islandearth.rpgregions.api.RPGRegionsAPI; import net.islandearth.rpgregions.api.integrations.IntegrationType; @@ -127,7 +126,7 @@ public class RegenUtils { int entityCount = 0; for (Entity entity : block.getChunk().getEntities()) { if (regeneratingEntity.isMythicEntity() - && MythicMobs.inst().getMobManager().isActiveMob(io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitAdapter.adapt(entity))) entityCount++; + && MythicBukkit.inst().getMobManager().isActiveMob(io.lumine.mythic.bukkit.BukkitAdapter.adapt(entity))) entityCount++; else if (!regeneratingEntity.isMythicEntity() && entity.getType() == EntityType.valueOf(regeneratingEntity.getEntity())) entityCount++; } @@ -135,8 +134,9 @@ public class RegenUtils { if (entityCount < regeneratingEntity.getMaxPerChunk()) { if (random.nextInt(regeneratingEntity.getRarity() - 1) == 1) { if (regeneratingEntity.isMythicEntity()) { - MythicMob mythicMob = MythicMobs.inst().getMobManager().getMythicMob(regeneratingEntity.getEntity()); - mythicMob.spawn(io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitAdapter.adapt(block.getLocation()), 1); + MythicBukkit.inst().getMobManager().getMythicMob(regeneratingEntity.getEntity()).ifPresent(mm -> { + mm.spawn(io.lumine.mythic.bukkit.BukkitAdapter.adapt(block.getLocation()), 1); + }); } else { configuredRegion.getWorld().spawnEntity(block.getLocation(), EntityType.valueOf(regeneratingEntity.getEntity())); } diff --git a/build.gradle.kts b/build.gradle.kts index aac1fcb..14f3e70 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,19 +11,9 @@ java.targetCompatibility = JavaVersion.VERSION_16 dependencies { testImplementation("junit:junit:4.13.2") - implementation(project(":rpgregions")) - implementation(project(":modern")) - implementation(project(":api")) -} - -tasks.shadowJar { - relocate("net.islandearth.languagy", "net.islandearth.rpgregions.libs.languagy") - relocate("co.aikar.commands", "net.islandearth.rpgregions.libs.acf") - relocate("co.aikar.idb", "net.islandearth.rpgregions.libs.idb") - relocate("com.github.stefvanschie.inventoryframework", "net.islandearth.rpgregions.libs.inventoryframework") - relocate("org.bstats", "net.islandearth.rpgregions.libs.bstats") - relocate("io.papermc.lib", "net.islandearth.rpgregions.libs.paperlib") - relocate("net.wesjd", "net.islandearth.rpgregions.libs.anvilgui") + implementation(project(":rpgregions", "shadow")) + implementation(project(":modern", "shadow")) + implementation(project(":api", "shadow")) } allprojects { diff --git a/rpgregions/build.gradle.kts b/rpgregions/build.gradle.kts index 956619a..7bea001 100644 --- a/rpgregions/build.gradle.kts +++ b/rpgregions/build.gradle.kts @@ -1,8 +1,3 @@ -repositories { - maven("https://repo.codemc.io/repository/nms/") - maven("https://repo.dmulloy2.net/repository/public/") -} - dependencies { testImplementation("junit:junit:4.13.2") testImplementation("com.github.seeseemelk:MockBukkit-v1.17:1.13.0") @@ -47,11 +42,22 @@ configurations.all { exclude("commons-codec") } -tasks.javadoc { - exclude("net/islandearth/rpgregions/translation/**") - exclude("net/islandearth/rpgregions/listener/**") - exclude("net/islandearth/rpgregions/gson/**") - exclude("net/islandearth/rpgregions/commands/**") - exclude("net/islandearth/rpgregions/utils/**") -} +tasks { + javadoc { + exclude("net/islandearth/rpgregions/translation/**") + exclude("net/islandearth/rpgregions/listener/**") + exclude("net/islandearth/rpgregions/gson/**") + exclude("net/islandearth/rpgregions/commands/**") + exclude("net/islandearth/rpgregions/utils/**") + } + shadowJar { + relocate("net.islandearth.languagy", "net.islandearth.rpgregions.libs.languagy") + relocate("co.aikar.commands", "net.islandearth.rpgregions.libs.acf") + relocate("co.aikar.idb", "net.islandearth.rpgregions.libs.idb") + relocate("com.github.stefvanschie.inventoryframework", "net.islandearth.rpgregions.libs.inventoryframework") + relocate("org.bstats", "net.islandearth.rpgregions.libs.bstats") + relocate("io.papermc.lib", "net.islandearth.rpgregions.libs.paperlib") + relocate("net.wesjd", "net.islandearth.rpgregions.libs.anvilgui") + } +} \ No newline at end of file