Minor Fixes

Author: RealMangorage

build.gradle

@@ -21,6 +21,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'org.gradlex.extra-java-module-info' version '1.12'
+}
+
 apply plugin: 'java'
 apply plugin: 'maven-publish'
 apply plugin: 'MangoBotGradle'
@@ -30,6 +34,10 @@ version = GitVersion.getGitVersion().getVersionAsString()
 
 println("Version: " + version)
 
+extraJavaModuleInfo {
+    setDeriveAutomaticModuleNamesFromFileNames(true)
+}
+
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(24)
@@ -64,9 +72,9 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     installer('org.mangorage:installer:4.0.3')
-    bot('org.mangorage:mangobot:11.0.75')
+    bot('org.mangorage:mangobot:12.0.7')
 
-    plugin('org.mangorage:mangobotplugin:11.1.31')
+    plugin('org.mangorage:mangobotplugin:12.0.4')
 
     library('org.eclipse.jetty:jetty-server:11.0.16')
     library('org.eclipse.jetty:jetty-servlet:11.0.16')

src/main/java/module-info.java

@@ -0,0 +1,11 @@
+module org.mangorage.mangobotwebsite {
+    requires freemarker;
+
+    requires org.mangorage.mangobotplugin;
+    requires org.mangorage.mangobotcore;
+    requires com.google.gson;
+    requires org.eclipse.jetty.servlet;
+    requires annotations;
+
+    exports org.mangorage.mangobotsite;
+}

src/main/java/org/mangorage/mangobotsite/MangoBotSite.java

@@ -1,18 +1,19 @@
 package org.mangorage.mangobotsite;
 
-import org.mangorage.mangobot.MangoBotPlugin;
-import org.mangorage.mangobotapi.core.plugin.AbstractPlugin;
-import org.mangorage.mangobotapi.core.plugin.PluginManager;
-import org.mangorage.mangobotapi.core.plugin.impl.Plugin;
+
+import org.mangorage.mangobotcore.plugin.api.MangoBotPlugin;
+import org.mangorage.mangobotcore.plugin.api.Plugin;
+import org.mangorage.mangobotcore.plugin.api.PluginManager;
+import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 import org.mangorage.mangobotsite.website.WebServer;
 import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
 import java.nio.file.Path;
 
-@Plugin(id = MangoBotSite.ID)
-public final class MangoBotSite extends AbstractPlugin {
+@MangoBotPlugin(id = MangoBotSite.ID)
+public final class MangoBotSite implements Plugin {
     public static final String ID = "mangobotsite";
 
     private final FileUploadManager fileUploadManager = new FileUploadManager(Path.of("webpage-root/uploads"));
@@ -25,12 +26,18 @@ public FileUploadManager getFileUploadManager() {
         return fileUploadManager;
     }
 
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
     @Override
-    protected void init() {
-        var pl = PluginManager.getPlugin("mangobot", MangoBotPlugin.class);
+    public void load() {
+        var pl = PluginManager.getInstance().getPlugin("mangobot").getInstance(MangoBot.class);
 
         ObjectMap objectMap = new ObjectMap();
-        objectMap.put("trickCommand", pl.getCommandRegistry().getCommand("trick"));
+        objectMap.put("trickCommand", pl.getCommandManager().getCommand("trick"));
         objectMap.put("jda", pl.getJDA());
         objectMap.put(WebConstants.FILE_MANAGER, fileUploadManager);
 

src/main/java/org/mangorage/mangobotsite/website/FolderPruner.java

@@ -1,6 +1,7 @@
 package org.mangorage.mangobotsite.website;
 
-import org.mangorage.basicutils.LogHelper;
+
+import org.mangorage.commonutils.log.LogHelper;
 
 import java.io.File;
 import java.util.Arrays;

src/main/java/org/mangorage/mangobotsite/website/WebServer.java

@@ -14,13 +14,13 @@
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.jetbrains.annotations.NotNull;
-import org.mangorage.basicutils.LogHelper;
+import org.mangorage.commonutils.log.LogHelper;
 import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
 import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
 import org.mangorage.mangobotsite.website.servlet.AccountServlet;
-import org.mangorage.mangobotsite.website.servlet.ChatServlet;
+
 import org.mangorage.mangobotsite.website.servlet.FileServlet;
 import org.mangorage.mangobotsite.website.servlet.FileUploadServlet;
 import org.mangorage.mangobotsite.website.servlet.HomeServlet;

src/main/java/org/mangorage/mangobotsite/website/filters/RequestInterceptorFilter.java

@@ -10,7 +10,8 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
-import org.mangorage.basicutils.LogHelper;
+import org.mangorage.commonutils.log.LogHelper;
+
 
 import java.io.IOException;
 

src/main/java/org/mangorage/mangobotsite/website/servlet/InfoServlet.java

@@ -4,10 +4,10 @@
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.mangorage.mangobotapi.core.plugin.PluginContainer;
-import org.mangorage.mangobotapi.core.plugin.PluginManager;
-import org.mangorage.mangobotapi.core.plugin.PluginMetadata;
-import org.mangorage.mangobotsite.website.Header;
+
+import org.mangorage.mangobotcore.plugin.api.Metadata;
+import org.mangorage.mangobotcore.plugin.api.PluginContainer;
+import org.mangorage.mangobotcore.plugin.api.PluginManager;
 import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 
@@ -24,7 +24,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         // Set content type for HTML response
         resp.setContentType("text/html");
 
-        List<PluginMetadata> plugins = PluginManager.getPluginContainers().stream()
+        List<Metadata> plugins = PluginManager.getInstance().getPlugins().stream()
                 .map(PluginContainer::getMetadata)
                 .toList();
 
@@ -33,7 +33,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
                         .put("plugins", plugins)
                         .get(),
                 "info.ftl",
-                resp.getWriter());
+                resp.getWriter()
+        );
 
     }
 

src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java

@@ -4,15 +4,14 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.dv8tion.jda.api.JDA;
-import org.mangorage.mangobot.modules.tricks.TrickCommand;
+import org.mangorage.mangobotplugin.commands.trick.TrickCommand;
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
 import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Date;
-import java.util.HashMap;
 
 import static org.mangorage.mangobotsite.website.util.WebUtil.processTemplate;
 
@@ -52,7 +51,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
         if (guildId != null) {
             try {
-                Long id = Long.parseLong(guildId);
+                long id = Long.parseLong(guildId);
                 if (command.getTricksForGuild(id).isEmpty()) {
                     processTemplate(
                             MapBuilder.of()