Implemented Issue #9

.gitignore

@@ -4,10 +4,7 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/
 *.iws
 *.iml
 *.ipr
@@ -35,4 +32,14 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+### Claude / AI ###
+.claude/
+codex-build.log
+
+### Docs ###
+docs/plans/
+
+### Generated ###
+dependency-reduced-pom.xml

pom.xml

@@ -5,12 +5,13 @@
 
     <groupId>com.magmaguy</groupId>
     <artifactId>ResourcePackManager</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.7.6</version>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <lombok.version>1.18.42</lombok.version>
     </properties>
 
     <repositories>
@@ -22,6 +23,11 @@
             <id>central</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
+        <repository>
+            <id>magmaguy-repo-releases</id>
+            <name>MagmaGuy's Repository</name>
+            <url>https://repo.magmaguy.com/releases</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -34,7 +40,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -47,10 +53,41 @@
             <artifactId>httpclient5</artifactId>
             <version>5.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.magmaguy</groupId>
+            <artifactId>MagmaCore</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- Bstats -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
+        <finalName>ResourcePackManager</finalName>
+
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -68,11 +105,26 @@
                                     <pattern>org.apache.hc</pattern>
                                     <shadedPattern>com.magmaguy.resourcepackmanager.org.apache.hc</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>com.magmaguy.resourcepackmanager.bstats</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>magmaguy-repo-snapshots</id>
+            <url>https://magmaguy.com/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>magmaguy-repo-snapshots</id>
+            <name>MagmaGuy's Repository</name>
+            <url>https://repo.magmaguy.com/releases</url>
+        </repository>
+    </distributionManagement>
 </project>

src/main/java/com/magmaguy/resourcepackmanager/ResourcePackManager.java

@@ -1,16 +1,43 @@
 package com.magmaguy.resourcepackmanager;
 
+import com.magmaguy.magmacore.MagmaCore;
+import com.magmaguy.magmacore.command.CommandManager;
+import com.magmaguy.magmacore.initialization.PluginInitializationConfig;
+import com.magmaguy.magmacore.initialization.PluginInitializationContext;
+import com.magmaguy.magmacore.initialization.PluginInitializationState;
+import com.magmaguy.magmacore.nightbreak.NightbreakPluginBootstrap;
+import com.magmaguy.magmacore.nightbreak.NightbreakPluginHooks;
+import com.magmaguy.magmacore.nightbreak.NightbreakPluginSpec;
+import com.magmaguy.magmacore.util.Logger;
 import com.magmaguy.resourcepackmanager.autohost.AutoHost;
-import com.magmaguy.resourcepackmanager.commands.CommandManager;
+import com.magmaguy.resourcepackmanager.commands.DataComplianceRequestCommand;
+import com.magmaguy.resourcepackmanager.commands.ReloadCommand;
+import com.magmaguy.resourcepackmanager.config.BlueprintFolder;
+import com.magmaguy.resourcepackmanager.itemsadder.ItemsAdderCommand;
+import com.magmaguy.resourcepackmanager.itemsadder.ItemsAdderDismissedConfig;
+import com.magmaguy.resourcepackmanager.itemsadder.ItemsAdderWarningListener;
+import com.magmaguy.resourcepackmanager.config.DataConfig;
 import com.magmaguy.resourcepackmanager.config.DefaultConfig;
-import com.magmaguy.resourcepackmanager.mixer.Mix;
+import com.magmaguy.resourcepackmanager.config.compatibleplugins.CompatiblePluginConfig;
+import com.magmaguy.resourcepackmanager.config.compatibleplugins.CompatiblePluginConfigFields;
+import com.magmaguy.resourcepackmanager.playermanager.PlayerManager;
+import com.magmaguy.resourcepackmanager.thirdparty.ThirdPartyResourcePack;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
+
 public class ResourcePackManager extends JavaPlugin {
 
-    public static Plugin plugin;
+    public static final NightbreakPluginSpec NIGHTBREAK_PLUGIN_SPEC = new NightbreakPluginSpec(
+            "ResourcePackManager", "resourcepackmanager", "resourcepackmanager.*",
+            "resourcepackmanager.setup", "resourcepackmanager.initialize",
+            "", "Reloaded ResourcePackManager.",
+            false, false, false);
+
+    public static JavaPlugin plugin;
 
     @Override
     public void onEnable() {
@@ -20,17 +47,111 @@ public void onEnable() {
                 " |   /\\__ \\  _/ |\\/| / _` | ' \\/ _` / _` / -_) '_|\n" +
                 " |_|_\\|___/_| |_|  |_\\__,_|_||_\\__,_\\__, \\___|_|  \n" +
                 "                                    |___/         ");
-        Logger.info("Enabling ResourcePackManager v." + this.getDescription().getVersion());
+        Bukkit.getLogger().info("ResourcePackManager v." + this.getDescription().getVersion());
         plugin = this;
-        DefaultConfig.initializeConfig();
-        Mix.initialize();
-        AutoHost.initialize();
-        new CommandManager(this);
+        NightbreakPluginBootstrap.startInitialization(this,
+                new PluginInitializationConfig("ResourcePackManager", null, 10),
+                NIGHTBREAK_PLUGIN_SPEC,
+                new NightbreakPluginHooks() {
+                    @Override
+                    public void asyncInitialization(PluginInitializationContext initializationContext) {
+                        ResourcePackManager.this.asyncInitialization(initializationContext);
+                    }
+
+                    @Override
+                    public void syncInitialization(PluginInitializationContext initializationContext) {
+                        ResourcePackManager.this.syncInitialization(initializationContext);
+                    }
+
+                    @Override
+                    public void onInitializationSuccess() {
+                        Logger.info("ResourcePackManager fully initialized!");
+                    }
+
+                    @Override
+                    public void onInitializationFailure(Throwable throwable) {
+                        throwable.printStackTrace();
+                    }
+                });
+    }
+
+    @Override
+    public void onLoad() {
+        MagmaCore.createInstance(this);
     }
 
     @Override
     public void onDisable() {
+        MagmaCore.requestInitializationShutdown(this);
+        if (MagmaCore.getInitializationState(this.getName()) == PluginInitializationState.INITIALIZING) {
+            Logger.info("Disabling ResourcePackManager during initialization");
+            ThirdPartyResourcePack.shutdown();
+            AutoHost.shutdown();
+            HandlerList.unregisterAll(this);
+            MagmaCore.shutdown(this);
+            return;
+        }
         Logger.info("Disabling ResourcePackManager");
+        ThirdPartyResourcePack.shutdown();
         AutoHost.shutdown();
+        HandlerList.unregisterAll(this);
+        MagmaCore.shutdown(this);
+    }
+
+    private void asyncInitialization(PluginInitializationContext initializationContext) {
+        initializationContext.step("Data Config");
+        new DataConfig();
+
+        initializationContext.step("Default Config");
+        new DefaultConfig();
+
+        initializationContext.step("ItemsAdder Config");
+        new ItemsAdderDismissedConfig();
+
+        initializationContext.step("Mixer Folder");
+        File mixerFolder = new File(getDataFolder(), "mixer");
+        if (!mixerFolder.exists()) {
+            mixerFolder.mkdirs();
+        }
+
+        initializationContext.step("Blueprint Folder");
+        BlueprintFolder.initialize();
+
+        initializationContext.step("Compatible Plugins");
+        new CompatiblePluginConfig();
+
+        initializationContext.step("Pack Integrations");
+        for (CompatiblePluginConfigFields compatiblePluginConfigFields : CompatiblePluginConfig.getCompatiblePlugins().values()) {
+            if (!compatiblePluginConfigFields.isEnabled()) continue;
+            ThirdPartyResourcePack.initializeThirdPartyResourcePack(compatiblePluginConfigFields);
+        }
+    }
+
+    private void syncInitialization(PluginInitializationContext initializationContext) {
+        initializationContext.step("Change Watchdog");
+        ThirdPartyResourcePack.startResourcePackChangeWatchdog();
+
+        initializationContext.step("Event Listeners");
+        if (DefaultConfig.isAutoHost()) {
+            Bukkit.getPluginManager().registerEvents(new PlayerManager(), this);
+        }
+        Bukkit.getPluginManager().registerEvents(new ItemsAdderWarningListener(), this);
+
+        initializationContext.step("Commands");
+        CommandManager commandManager = new CommandManager(this, "resourcepackmanager");
+        NightbreakPluginBootstrap.registerStandardCommands(this,
+                commandManager,
+                NIGHTBREAK_PLUGIN_SPEC,
+                player -> Logger.sendMessage(player, "&eResourcePackManager has no setup menu. Edit config files in plugins/ResourcePackManager/ and use &6/resourcepackmanager reload&e."),
+                sender -> ReloadCommand.reloadPlugin(sender));
+        commandManager.registerCommand(new ReloadCommand());
+        commandManager.registerCommand(new DataComplianceRequestCommand());
+        commandManager.registerCommand(new ItemsAdderCommand());
+
+        initializationContext.step("Metrics");
+        new Metrics(this, 22867);
+
+        initializationContext.step("Version Check");
+        MagmaCore.checkVersionUpdate("118574", "https://www.spigotmc.org/resources/resource-pack-manager.118574/");
     }
-}
+}