Skip to content
Snippets Groups Projects
Verified Commit ea3374ca authored by SamB440's avatar SamB440
Browse files

Update to Mythic Mobs 5

parent a31f6d41
No related branches found
No related tags found
No related merge requests found
......@@ -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")
}
}
......
......@@ -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()));
}
......
......@@ -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 {
......
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,7 +42,8 @@ configurations.all {
exclude("commons-codec")
}
tasks.javadoc {
tasks {
javadoc {
exclude("net/islandearth/rpgregions/translation/**")
exclude("net/islandearth/rpgregions/listener/**")
exclude("net/islandearth/rpgregions/gson/**")
......@@ -55,3 +51,13 @@ tasks.javadoc {
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment