From a26fcf28c69f8fc29924e90fa231c94e8f6e8e00 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Mon, 11 Jul 2022 18:41:10 +0200 Subject: [PATCH] support for mythiclib 1.3.4 --- pom.xml | 10 ++-------- src/main/java/net/Indyuce/mmocore/MMOCore.java | 12 +++++++----- .../net/Indyuce/mmocore/api/util/MMOCoreUtils.java | 6 ++---- .../experience/source/EatExperienceSource.java | 2 +- .../net/Indyuce/mmocore/listener/BlockListener.java | 3 +-- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index ac34c689..e4040879 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.Indyuce MMOCore - 1.9.4 + 1.9.5 MMOCore Offer your players a brand new RPG experience!! @@ -125,12 +125,6 @@ - - org.jetbrains - annotations - 19.0.0 - provided - io.papermc @@ -149,7 +143,7 @@ io.lumine MythicLib-dist - 1.3.3 + 1.3.4 provided diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index 5e5c987c..57d664ce 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -2,9 +2,8 @@ package net.Indyuce.mmocore; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.UtilityMethods; -import io.lumine.mythic.lib.comp.Metrics; +import io.lumine.mythic.lib.metrics.bukkit.Metrics; import io.lumine.mythic.lib.version.SpigotPlugin; -import io.lumine.mythic.utils.plugin.LuminePlugin; import net.Indyuce.mmocore.comp.citizens.CitizenInteractEventListener; import net.Indyuce.mmocore.comp.citizens.CitizensMMOLoader; import net.Indyuce.mmocore.comp.mythicmobs.MythicHook; @@ -57,6 +56,7 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandMap; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.NotNull; import org.spigotmc.SpigotConfig; @@ -65,7 +65,7 @@ import java.io.File; import java.lang.reflect.Field; import java.util.logging.Level; -public class MMOCore extends LuminePlugin { +public class MMOCore extends JavaPlugin { public static MMOCore plugin; public final WaypointManager waypointManager = new WaypointManager(); @@ -115,7 +115,8 @@ public class MMOCore extends LuminePlugin { plugin = this; } - public void load() { + @Override + public void onLoad() { // Register MMOCore-specific objects MythicLib.plugin.getEntities().registerRestriction(new MMOCoreTargetRestriction()); @@ -140,7 +141,8 @@ public class MMOCore extends LuminePlugin { loadManager.registerLoader(new MythicMobsMMOLoader()); } - public void enable() { + @Override + public void onEnable() { new SpigotPlugin(70575, this).checkForUpdate(); new Metrics(this); saveDefaultConfig(); diff --git a/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java index bd3b4050..2c57d437 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java @@ -3,9 +3,8 @@ package net.Indyuce.mmocore.api.util; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.hologram.Hologram; import io.lumine.mythic.lib.version.VersionMaterial; -import io.lumine.mythic.utils.holograms.Hologram; -import io.lumine.mythic.utils.serialize.Position; import net.Indyuce.mmocore.MMOCore; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -64,8 +63,7 @@ public class MMOCoreUtils { * @param message Message to display */ public static void displayIndicator(Location loc, String message) { - Hologram holo = Hologram.create(Position.of(loc), Arrays.asList(message)); - holo.spawn(); + Hologram holo = Hologram.create(loc, Arrays.asList(message)); Bukkit.getScheduler().runTaskLater(MMOCore.plugin, () -> holo.despawn(), 20); } diff --git a/src/main/java/net/Indyuce/mmocore/experience/source/EatExperienceSource.java b/src/main/java/net/Indyuce/mmocore/experience/source/EatExperienceSource.java index b312b5ac..505396aa 100644 --- a/src/main/java/net/Indyuce/mmocore/experience/source/EatExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/experience/source/EatExperienceSource.java @@ -5,7 +5,7 @@ import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser; import net.Indyuce.mmocore.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.manager.profession.ExperienceSourceManager; import net.Indyuce.mmocore.api.player.PlayerData; -import org.apache.commons.lang3.Validate; +import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java index 3b8d720c..70d6a3d5 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java @@ -2,7 +2,6 @@ package net.Indyuce.mmocore.listener; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.UtilityMethods; -import io.lumine.mythic.utils.Schedulers; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.block.BlockInfo; import net.Indyuce.mmocore.api.block.VanillaBlockType; @@ -137,7 +136,7 @@ public class BlockListener implements Listener { * Finally enable block regen. */ if (info.hasRegen()) - Schedulers.sync().runLater(() -> MMOCore.plugin.mineManager.initialize(info.startRegeneration(Bukkit.createBlockData(savedData), block.getLocation()), !temporaryBlock), 1); + Bukkit.getScheduler().runTaskLater(MythicLib.plugin, () -> MMOCore.plugin.mineManager.initialize(info.startRegeneration(Bukkit.createBlockData(savedData), block.getLocation()), !temporaryBlock), 1); } /**