From 044c30dd441b687a202d2fea3f545fd8ca487a73 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 2 Feb 2025 08:35:36 -0800 Subject: [PATCH] Remove Dynmap - old version was referenced If we need support it needs to be rewritten using new API approach --- pom.xml | 11 --- .../bentobox/bentobox/hooks/DynmapHook.java | 90 ------------------- 2 files changed, 101 deletions(-) delete mode 100644 src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java diff --git a/pom.xml b/pom.xml index 709109f32..2c374aea4 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ 1.7.1 2.10.9 d5f5e0bbd8 - 3.0-SNAPSHOT 1.19.3-v1 ${build.version}-SNAPSHOT @@ -153,10 +152,6 @@ codemc-repo https://repo.codemc.org/repository/maven-public - - dynmap-repo - https://repo.mikeprimm.com/ - papermc https://repo.papermc.io/repository/maven-public/ @@ -326,12 +321,6 @@ provided - - us.dynmap - dynmap-api - ${dynmap.version} - provided - com.bergerkiller.bukkit MyWorlds diff --git a/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java b/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java deleted file mode 100644 index a14cbaf93..000000000 --- a/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java +++ /dev/null @@ -1,90 +0,0 @@ -package world.bentobox.bentobox.hooks; - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import org.bukkit.Material; -import org.dynmap.DynmapAPI; -import org.dynmap.markers.MarkerAPI; -import org.dynmap.markers.MarkerSet; -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; - -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.api.addons.GameModeAddon; -import world.bentobox.bentobox.api.hooks.Hook; - -/** - * @author Poslovitch - * @since 1.5.0 - */ -public class DynmapHook extends Hook { - - private MarkerAPI markerAPI; - - @NonNull - private final Map<@NonNull GameModeAddon, @NonNull MarkerSet> markerSets; - - public DynmapHook() { - super("dynmap", Material.FILLED_MAP); - this.markerSets = new HashMap<>(); - } - - @Override - public boolean hook() { - try { - DynmapAPI dynmapAPI = (DynmapAPI) getPlugin(); - - MarkerAPI markers = dynmapAPI.getMarkerAPI(); - - if (markers == null) { - return false; - } - markerAPI = markers; - - BentoBox.getInstance().getAddonsManager().getGameModeAddons().forEach(this::registerMarkerSet); - - return true; - } catch (Exception e) { - return false; - } - } - - public void registerMarkerSet(@NonNull GameModeAddon addon) { - String name = addon.getDescription().getName(); - if (getMarkerSet(addon) == null) { - // From the javadoc: createMarkerSet(String id, String label, Set allowedIcons, boolean persistent) - MarkerSet set = markerAPI.createMarkerSet(name.toLowerCase(Locale.ENGLISH) + ".markers", name, null, true); - markerSets.put(addon, set); - } - } - - @NonNull - public Map getMarkerSets() { - return markerSets; - } - - @Nullable - public MarkerSet getMarkerSet(@NonNull GameModeAddon addon) { - if (markerSets.containsKey(addon)) { - return markerSets.get(addon); - } else { - return markerAPI.getMarkerSet(addon.getDescription().getName().toLowerCase(Locale.ENGLISH) + ".markers"); - } - } - - /** - * Returns the MarkerAPI instance. Not null. - * @return the MarkerAPI instance. - */ - @NonNull - public MarkerAPI getMarkerAPI() { - return markerAPI; - } - - @Override - public String getFailureCause() { - return "the version of dynmap you're using is incompatible with this hook. Use a newer version."; - } -} \ No newline at end of file