From 794135b02ea9d3d84e03cfd7984e235be575b629 Mon Sep 17 00:00:00 2001 From: Zeshan Aslam Date: Sat, 26 Mar 2022 11:33:22 -0400 Subject: [PATCH] Updated to support MythicMobs 5.0.2. Temp using files directly for MVdWPlaceholderAPI and MythicMobs --- build.gradle | 13 ++++++------- .../actionhealth/support/MythicMobsSupport.java | 14 +++++++++++--- .../BrazilianPortuguese.yml | 0 .../translations => translations}/French.yml | 0 .../translations => translations}/German.yml | 0 .../translations => translations}/Italian.yml | 0 .../translations => translations}/Japanese.yml | 0 .../translations => translations}/Polish.yml | 0 .../translations => translations}/Russian.yml | 0 .../SimplifiedChinese.yml | 0 .../translations => translations}/Spanish.yml | 0 .../translations => translations}/Turkish.yml | 0 12 files changed, 17 insertions(+), 10 deletions(-) rename {src/main/resources/translations => translations}/BrazilianPortuguese.yml (100%) rename {src/main/resources/translations => translations}/French.yml (100%) rename {src/main/resources/translations => translations}/German.yml (100%) rename {src/main/resources/translations => translations}/Italian.yml (100%) rename {src/main/resources/translations => translations}/Japanese.yml (100%) rename {src/main/resources/translations => translations}/Polish.yml (100%) rename {src/main/resources/translations => translations}/Russian.yml (100%) rename {src/main/resources/translations => translations}/SimplifiedChinese.yml (100%) rename {src/main/resources/translations => translations}/Spanish.yml (100%) rename {src/main/resources/translations => translations}/Turkish.yml (100%) diff --git a/build.gradle b/build.gradle index 716c7fc..44ef506 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.zeshanaslam' -version = '3.5.6' +version = '3.5.7' repositories { mavenCentral() @@ -22,11 +22,11 @@ repositories { } maven { name = 'langutils-repo' - url 'https://raw.github.com/MascusJeoraly/LanguageUtils/mvn-repo/' + url = 'https://raw.github.com/MascusJeoraly/LanguageUtils/mvn-repo/' } maven { name = 'Lumine Releases' - url 'https://mvn.lumine.io/repository/maven-public/' + url = 'https://mvn.lumine.io/repository/maven-public/' } maven { name = 'papi-repo' @@ -40,16 +40,15 @@ repositories { dependencies { compileOnly 'org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT' - compileOnly 'io.lumine.xikage:MythicMobs:4.9.1' compileOnly 'me.clip:placeholderapi:2.10.10' compileOnly 'org.apache.commons:commons-lang3:3.12.0' compileOnly 'com.meowj:LangUtils:1.9' - compileOnly 'be.maximvdw:MVdWPlaceholderAPI:3.1.1' + compileOnly files('temp_libs/MVdWPlaceholderAPI.jar') + compileOnly files('temp_libs/MythicMobs-5.0.2.jar') implementation 'org.codemc.worldguardwrapper:worldguardwrapper:1.2.0-SNAPSHOT' - } -def targetJavaVersion = 8 +def targetJavaVersion = 16 java { def javaVersion = JavaVersion.toVersion(targetJavaVersion) sourceCompatibility = javaVersion diff --git a/src/main/java/com/zeshanaslam/actionhealth/support/MythicMobsSupport.java b/src/main/java/com/zeshanaslam/actionhealth/support/MythicMobsSupport.java index 541c2bf..430fa4c 100644 --- a/src/main/java/com/zeshanaslam/actionhealth/support/MythicMobsSupport.java +++ b/src/main/java/com/zeshanaslam/actionhealth/support/MythicMobsSupport.java @@ -1,14 +1,22 @@ package com.zeshanaslam.actionhealth.support; -import io.lumine.xikage.mythicmobs.MythicMobs; +import io.lumine.mythic.bukkit.BukkitAPIHelper; +import io.lumine.mythic.bukkit.MythicBukkit; +import org.bukkit.Bukkit; import org.bukkit.entity.Entity; public class MythicMobsSupport { + private static final MythicBukkit plugin = (MythicBukkit) Bukkit.getServer().getPluginManager().getPlugin("MythicMobs"); + public String getMythicName(Entity entity) { - if (MythicMobs.inst().getAPIHelper().isMythicMob(entity)) { - return MythicMobs.inst().getAPIHelper().getMythicMobInstance(entity).getType().getInternalName(); + if (plugin == null) { + return null; } + BukkitAPIHelper bucketApiHelper = plugin.getAPIHelper(); + if (bucketApiHelper.isMythicMob(entity)) { + return bucketApiHelper.getMythicMobInstance(entity).getType().getInternalName(); + } return null; } } diff --git a/src/main/resources/translations/BrazilianPortuguese.yml b/translations/BrazilianPortuguese.yml similarity index 100% rename from src/main/resources/translations/BrazilianPortuguese.yml rename to translations/BrazilianPortuguese.yml diff --git a/src/main/resources/translations/French.yml b/translations/French.yml similarity index 100% rename from src/main/resources/translations/French.yml rename to translations/French.yml diff --git a/src/main/resources/translations/German.yml b/translations/German.yml similarity index 100% rename from src/main/resources/translations/German.yml rename to translations/German.yml diff --git a/src/main/resources/translations/Italian.yml b/translations/Italian.yml similarity index 100% rename from src/main/resources/translations/Italian.yml rename to translations/Italian.yml diff --git a/src/main/resources/translations/Japanese.yml b/translations/Japanese.yml similarity index 100% rename from src/main/resources/translations/Japanese.yml rename to translations/Japanese.yml diff --git a/src/main/resources/translations/Polish.yml b/translations/Polish.yml similarity index 100% rename from src/main/resources/translations/Polish.yml rename to translations/Polish.yml diff --git a/src/main/resources/translations/Russian.yml b/translations/Russian.yml similarity index 100% rename from src/main/resources/translations/Russian.yml rename to translations/Russian.yml diff --git a/src/main/resources/translations/SimplifiedChinese.yml b/translations/SimplifiedChinese.yml similarity index 100% rename from src/main/resources/translations/SimplifiedChinese.yml rename to translations/SimplifiedChinese.yml diff --git a/src/main/resources/translations/Spanish.yml b/translations/Spanish.yml similarity index 100% rename from src/main/resources/translations/Spanish.yml rename to translations/Spanish.yml diff --git a/src/main/resources/translations/Turkish.yml b/translations/Turkish.yml similarity index 100% rename from src/main/resources/translations/Turkish.yml rename to translations/Turkish.yml