Use softdepend for all non essential dependencies

Closes #37

Author: Warriorrrr

src/main/java/net/earthmc/emcapi/EMCAPI.java

@@ -4,6 +4,7 @@
 import io.javalin.util.JavalinLogger;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import net.earthmc.emcapi.integration.Integrations;
 import net.earthmc.emcapi.manager.EndpointManager;
 import net.earthmc.emcapi.util.EndpointUtils;
 import net.earthmc.emcapi.command.OptOutCommand;
@@ -23,6 +24,7 @@ public final class EMCAPI extends JavaPlugin {
 
     public static EMCAPI instance;
     private Javalin javalin;
+    private Integrations pluginIntegrations;
 
     @Override
     public void onLoad() {
@@ -37,6 +39,9 @@ public void onEnable() {
         loadConfig();
         initialiseJavalin();
 
+        this.pluginIntegrations = new Integrations(this);
+        getServer().getPluginManager().registerEvents(this.pluginIntegrations, this);
+
         EndpointManager endpointManager = new EndpointManager(this);
         endpointManager.loadEndpoints();
 
@@ -64,7 +69,7 @@ public void onDisable() {
             getLogger().warning("IOException while saving opted-out players: " + e);
         }
     }
-    
+
     private void initialiseJavalin() {
         javalin = Javalin.create(config -> {
             config.jetty.modifyServer(server -> {
@@ -111,4 +116,8 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
     public Javalin getJavalin() {
         return javalin;
     }
+
+    public Integrations integrations() {
+        return this.pluginIntegrations;
+    }
 }

src/main/java/net/earthmc/emcapi/endpoint/DiscordEndpoint.java

@@ -3,34 +3,42 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import github.scarsz.discordsrv.DiscordSRV;
-import github.scarsz.discordsrv.objects.managers.AccountLinkManager;
 import io.javalin.http.BadRequestResponse;
 import net.earthmc.emcapi.object.endpoint.PostEndpoint;
 import net.earthmc.emcapi.object.nearby.DiscordContext;
 import net.earthmc.emcapi.object.nearby.DiscordType;
 import net.earthmc.emcapi.util.EndpointUtils;
+import net.earthmc.emcapi.util.HttpExceptions;
 import net.earthmc.emcapi.util.JSONUtil;
 
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DiscordEndpoint extends PostEndpoint<DiscordContext> {
-    private static final Pattern pattern = Pattern.compile("^\\d{17,19}$");
-    private final AccountLinkManager alm = DiscordSRV.getPlugin().getAccountLinkManager();
+    private static final Pattern ID_PATTERN = Pattern.compile("^\\d{17,19}$");
+    private static final BadRequestResponse MISSING_TYPE_TARGET = new BadRequestResponse("Your JSON query is missing a type or target");
+    private static final BadRequestResponse INVALID_TYPE_TARGET = new BadRequestResponse("Your JSON query has an invalid type or target");
 
     @Override
     public DiscordContext getObjectOrNull(JsonElement element) {
         JsonObject jsonObject = JSONUtil.getJsonElementAsJsonObjectOrNull(element);
-        if (jsonObject == null) throw new BadRequestResponse("Your query contains a value that is not a JSON object");
+        if (jsonObject == null) {
+            throw HttpExceptions.NOT_A_JSON_OBJECT;
+        }
 
         JsonElement typeElement = jsonObject.get("type");
         JsonElement targetElement = jsonObject.get("target");
-        if (typeElement == null || targetElement == null) throw new BadRequestResponse("Your JSON query is missing a type or target");
+        if (typeElement == null || targetElement == null) {
+            throw MISSING_TYPE_TARGET;
+        }
 
         String typeString = JSONUtil.getJsonElementAsStringOrNull(typeElement);
         String target = JSONUtil.getJsonElementAsStringOrNull(targetElement);
-        if (typeString == null || target == null) throw new BadRequestResponse("Your JSON query has an invalid type or target");
+        if (typeString == null || target == null) {
+            throw INVALID_TYPE_TARGET;
+        }
+
         UUID uuid = null;
         try {
             uuid = getUUIDFromStr(target);
@@ -63,8 +71,11 @@ public JsonElement getJsonElement(DiscordContext context) {
             discordObject.addProperty("uuid", uuid == null ? null : uuid.toString());
         } else if (type == DiscordType.MINECRAFT) {
             UUID uuid = getUUIDFromStr(target);
-            if (uuid == null) throw new BadRequestResponse(target + " is not a valid Minecraft UUID");
-            discordObject.addProperty("id", alm.getDiscordId(uuid));
+            if (uuid == null) {
+                throw new BadRequestResponse(target + " is not a valid Minecraft UUID");
+            }
+
+            discordObject.addProperty("id", DiscordSRV.getPlugin().getAccountLinkManager().getDiscordId(uuid));
             discordObject.addProperty("uuid", uuid.toString());
         }
 
@@ -82,10 +93,10 @@ private UUID getUUIDFromStr(String uuidStr) {
     }
 
     private UUID getUUIDFromDiscordId(String discordId) {
-        Matcher matcher = pattern.matcher(discordId);
+        Matcher matcher = ID_PATTERN.matcher(discordId);
 
         if (!matcher.find()) return null;
 
-        return alm.getUuid(discordId);
+        return DiscordSRV.getPlugin().getAccountLinkManager().getUuid(discordId);
     }
 }

src/main/java/net/earthmc/emcapi/endpoint/MysteryMasterEndpoint.java

@@ -3,7 +3,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import io.javalin.http.ServiceUnavailableResponse;
 import net.earthmc.emcapi.EMCAPI;
 import net.earthmc.emcapi.object.endpoint.GetEndpoint;
 import net.earthmc.mysterymaster.api.MysteryMasterAPI;
@@ -15,7 +14,6 @@
 public class MysteryMasterEndpoint extends GetEndpoint {
 
     private MysteryMasterAPI api = null;
-    private final ServiceUnavailableResponse UNAVAILABLE = new ServiceUnavailableResponse("Mystery Master details are not available currently");
 
     public MysteryMasterEndpoint(final EMCAPI plugin) {
         try {
@@ -27,7 +25,6 @@ public MysteryMasterEndpoint(final EMCAPI plugin) {
 
     @Override
     public String lookup() {
-        if (api == null) throw UNAVAILABLE;
         return getJsonElement().toString();
     }
 

src/main/java/net/earthmc/emcapi/endpoint/ServerEndpoint.java

@@ -1,20 +1,17 @@
 package net.earthmc.emcapi.endpoint;
 
-import au.lupine.quarters.api.manager.QuarterManager;
 import com.google.gson.JsonObject;
 import com.palmergames.bukkit.towny.TownyAPI;
 import com.palmergames.bukkit.towny.TownySettings;
-import io.minimum.minecraft.superbvote.SuperbVote;
-import io.minimum.minecraft.superbvote.votes.VoteParty;
 import net.earthmc.emcapi.EMCAPI;
+import net.earthmc.emcapi.integration.QuartersIntegration;
+import net.earthmc.emcapi.integration.SuperbVoteIntegration;
 import net.earthmc.emcapi.object.endpoint.GetEndpoint;
 import net.earthmc.emcapi.util.EndpointUtils;
-import au.lupine.quarters.object.entity.Quarter;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
 import java.time.LocalTime;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class ServerEndpoint extends GetEndpoint {
@@ -27,11 +24,13 @@ public class ServerEndpoint extends GetEndpoint {
     public ServerEndpoint(final EMCAPI plugin) {
         this.plugin = plugin;
 
+        final QuartersIntegration quartersIntegration = plugin.integrations().quartersIntegration();
+
         plugin.getServer().getAsyncScheduler().runAtFixedRate(plugin, task -> {
-            List<Quarter> quarters = QuarterManager.getInstance().getAllQuarters();
+            final QuartersIntegration.QuarterStatistics statistics = quartersIntegration.retrieveQuarterStatistics();
 
-            this.quartersCount = quarters.size();
-            this.cuboidsCount = quarters.stream().mapToInt(quarter -> quarter.getCuboids().size()).sum();
+            this.quartersCount = statistics.totalQuarters();
+            this.cuboidsCount = statistics.totalCuboids();
         }, 0L, 1L, TimeUnit.HOURS);
     }
 
@@ -77,9 +76,17 @@ public JsonObject getJsonElement() {
 
         serverObject.add("stats", statsObject);
 
-        VoteParty voteParty = SuperbVote.getPlugin().getVoteParty();
-        int target = voteParty.votesNeeded();
-        int currentVotes = voteParty.getCurrentVotes();
+        int target;
+        int currentVotes;
+
+        final SuperbVoteIntegration superbVote = plugin.integrations().superbVoteIntegration();
+        if (superbVote.isEnabled()) {
+            target = superbVote.votesNeeded();
+            currentVotes = superbVote.currentVotes();
+        } else {
+            target = 0;
+            currentVotes = 0;
+        }
 
         JsonObject votePartyObject = new JsonObject();
         votePartyObject.addProperty("target", target);
@@ -88,4 +95,4 @@ public JsonObject getJsonElement() {
 
         return serverObject;
     }
-}
+}

src/main/java/net/earthmc/emcapi/endpoint/towny/TownsEndpoint.java

@@ -1,6 +1,5 @@
 package net.earthmc.emcapi.endpoint.towny;
 
-import au.lupine.quarters.api.manager.QuarterManager;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -10,6 +9,8 @@
 import com.palmergames.bukkit.towny.object.TownBlock;
 import com.palmergames.bukkit.towny.permissions.TownyPerms;
 import io.javalin.http.BadRequestResponse;
+import net.earthmc.emcapi.EMCAPI;
+import net.earthmc.emcapi.integration.QuartersIntegration;
 import net.earthmc.emcapi.manager.TownMetadataManager;
 import net.earthmc.emcapi.object.endpoint.PostEndpoint;
 import net.earthmc.emcapi.util.EndpointUtils;
@@ -18,6 +19,11 @@
 import java.util.UUID;
 
 public class TownsEndpoint extends PostEndpoint<Town> {
+    private final EMCAPI plugin;
+
+    public TownsEndpoint(EMCAPI plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public Town getObjectOrNull(JsonElement element) {
@@ -102,7 +108,8 @@ public JsonElement getJsonElement(Town town) {
         townObject.add("trusted", EndpointUtils.getResidentArray(town.getTrustedResidents().stream().toList()));
         townObject.add("outlaws", EndpointUtils.getResidentArray(town.getOutlaws().stream().toList()));
 
-        JsonArray quartersArray = EndpointUtils.getQuarterArray(QuarterManager.getInstance().getQuarters(town));
+        final QuartersIntegration quartersIntegration = plugin.integrations().quartersIntegration();
+        JsonArray quartersArray = quartersIntegration.isEnabled() ? quartersIntegration.getQuartersArrayForTown(town) : new JsonArray();
         townObject.add("quarters", quartersArray);
 
         JsonObject ranksObject = new JsonObject();

src/main/java/net/earthmc/emcapi/endpoint/towny/list/QuartersListEndpoint.java

@@ -1,11 +1,15 @@
 package net.earthmc.emcapi.endpoint.towny.list;
 
-import au.lupine.quarters.api.manager.QuarterManager;
 import com.google.gson.JsonArray;
+import net.earthmc.emcapi.integration.QuartersIntegration;
 import net.earthmc.emcapi.object.endpoint.GetEndpoint;
-import net.earthmc.emcapi.util.EndpointUtils;
 
 public class QuartersListEndpoint extends GetEndpoint {
+    private final QuartersIntegration quartersIntegration;
+
+    public QuartersListEndpoint(QuartersIntegration quartersIntegration) {
+        this.quartersIntegration = quartersIntegration;
+    }
 
     @Override
     public String lookup() {
@@ -14,6 +18,6 @@ public String lookup() {
 
     @Override
     public JsonArray getJsonElement() {
-        return EndpointUtils.getQuarterArray(QuarterManager.getInstance().getAllQuarters());
+        return quartersIntegration.getAllQuartersArray();
     }
 }

src/main/java/net/earthmc/emcapi/integration/DiscordIntegration.java

@@ -0,0 +1,7 @@
+package net.earthmc.emcapi.integration;
+
+public class DiscordIntegration extends Integration {
+    public DiscordIntegration() {
+        super("DiscordSRV");
+    }
+}

src/main/java/net/earthmc/emcapi/integration/Integration.java

@@ -0,0 +1,39 @@
+package net.earthmc.emcapi.integration;
+
+import net.earthmc.emcapi.util.HttpExceptions;
+
+/**
+ * Represents an integration with another plugin.
+ */
+public abstract class Integration {
+    private final String name;
+    private boolean enabled;
+
+    protected Integration(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * {@return the name of the plugin that this is integrating with}
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * {@return whether the plugin for this integration is currently enabled}
+     */
+    public boolean isEnabled() {
+        return this.enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void throwIfDisabled() {
+        if (!this.enabled) {
+            throw HttpExceptions.MISSING_PLUGIN;
+        }
+    }
+}

src/main/java/net/earthmc/emcapi/integration/Integrations.java

@@ -0,0 +1,68 @@
+package net.earthmc.emcapi.integration;
+
+import net.earthmc.emcapi.EMCAPI;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class Integrations implements Listener {
+    private final EMCAPI plugin;
+
+    private final Map<String, Integration> integrations = new ConcurrentHashMap<>();
+    private final DiscordIntegration discordIntegration;
+    private final QuartersIntegration quartersIntegration;
+    private final SuperbVoteIntegration superbVoteIntegration;
+    private final MysteryMasterIntegration mysteryMasterIntegration;
+
+    public Integrations(final EMCAPI plugin) {
+        this.plugin = plugin;
+
+        this.discordIntegration = addIntegration(new DiscordIntegration());
+        this.quartersIntegration = addIntegration(new QuartersIntegration());
+        this.superbVoteIntegration = addIntegration(new SuperbVoteIntegration());
+        this.mysteryMasterIntegration = addIntegration(new MysteryMasterIntegration());
+    }
+
+    private <T extends Integration> T addIntegration(final T integration) {
+        integrations.put(integration.name(), integration);
+
+        integration.setEnabled(plugin.getServer().getPluginManager().isPluginEnabled(integration.name()));
+        return integration;
+    }
+
+    public DiscordIntegration discordIntegration() {
+        return this.discordIntegration;
+    }
+
+    public QuartersIntegration quartersIntegration() {
+        return this.quartersIntegration;
+    }
+
+    public SuperbVoteIntegration superbVoteIntegration() {
+        return this.superbVoteIntegration;
+    }
+
+    public MysteryMasterIntegration mysteryMasterIntegration() {
+        return this.mysteryMasterIntegration;
+    }
+
+    @EventHandler
+    public void onPluginEnable(final PluginEnableEvent event) {
+        final Integration integration = integrations.get(event.getPlugin().getName());
+        if (integration != null) {
+            integration.setEnabled(true);
+        }
+    }
+
+    @EventHandler
+    public void onPluginDisable(final PluginDisableEvent event) {
+        final Integration integration = integrations.get(event.getPlugin().getName());
+        if (integration != null) {
+            integration.setEnabled(false);
+        }
+    }
+}