Merge branch 'master' of github.com:LucidAPs/AdvancedAchievements

Author: neokoni

advanced-achievements-plugin/pom.xml

@@ -23,7 +23,7 @@
 						<path>
 							<groupId>com.google.dagger</groupId>
 							<artifactId>dagger-compiler</artifactId>
-							<version>2.40</version>
+							<version>2.57.2</version>
 						</path>
 					</annotationProcessorPaths>
 				</configuration>

advanced-achievements-plugin/src/main/java/com/hm/achievement/JobsEnableWatcher.java

@@ -0,0 +1,43 @@
+package com.hm.achievement;
+
+import com.hm.achievement.AdvancedAchievements;
+import com.hm.achievement.exception.PluginLoadError;
+import com.hm.achievement.lifecycle.PluginLoader;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginEnableEvent;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Singleton
+public class JobsEnableWatcher implements Listener {
+    private final AdvancedAchievements aa;
+    private final Provider<PluginLoader> loaderProvider; // <-- Provider breaks the cycle
+    private final Logger log;
+
+    @Inject
+    public JobsEnableWatcher(AdvancedAchievements aa, Provider<PluginLoader> loaderProvider, Logger log) {
+        this.aa = aa;
+        this.loaderProvider = loaderProvider;
+        this.log = log;
+    }
+
+    @EventHandler
+    public void onPluginEnable(PluginEnableEvent e) {
+        if (e.getPlugin().getName().equalsIgnoreCase("Jobs")) {
+            AdvancedAchievements.getFoliaLib().getScheduler().runNextTick(wrappedTask -> {
+                try {
+                    loaderProvider.get().loadAdvancedAchievements(); // mirrors /aach reload
+                    log.info("[AdvancedAchievements] Jobs enabled; JobsReborn category now active.");
+                } catch (PluginLoadError ex) {
+                    log.log(Level.SEVERE, "Could not enable JobsReborn category after Jobs enable:", ex);
+                }
+            });
+        }
+    }
+}

advanced-achievements-plugin/src/main/java/com/hm/achievement/lifecycle/PluginLoader.java

@@ -8,6 +8,7 @@
 import javax.inject.Singleton;
 
 import com.tcoded.folialib.wrapper.task.WrappedTask;
+import com.hm.achievement.JobsEnableWatcher;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
@@ -53,6 +54,7 @@ public class PluginLoader {
 	private final ReloadCommand reloadCommand;
 	private final Set<Reloadable> reloadables;
 	private final AchievementMap achievementMap;
+    private final JobsEnableWatcher jobsEnableWatcher; // <-- add
 
 	// Listeners, to monitor various events.
 	private final JoinListener joinListener;
@@ -94,7 +96,9 @@ public PluginLoader(AdvancedAchievements advancedAchievements, Logger logger, Se
 			CommandTabCompleter commandTabCompleter, Set<Category> disabledCategories,
 			@Named("main") YamlConfiguration mainConfig, ConfigurationParser configurationParser,
 			AchieveDistanceRunnable distanceRunnable, AchievePlayTimeRunnable playTimeRunnable, ReloadCommand reloadCommand,
-			AchievementMap achievementMap) {
+            AchievementMap achievementMap,
+            JobsEnableWatcher jobsEnableWatcher
+    ) {
 		this.advancedAchievements = advancedAchievements;
 		this.logger = logger;
 		this.reloadables = reloadables;
@@ -115,7 +119,8 @@ public PluginLoader(AdvancedAchievements advancedAchievements, Logger logger, Se
 		this.playTimeRunnable = playTimeRunnable;
 		this.reloadCommand = reloadCommand;
 		this.achievementMap = achievementMap;
-	}
+        this.jobsEnableWatcher = jobsEnableWatcher;
+    }
 
 	/**
 	 * Loads the plugin.
@@ -180,7 +185,8 @@ private void registerListeners() {
 		pluginManager.registerEvents(listGUIListener, advancedAchievements);
 		pluginManager.registerEvents(playerAdvancedAchievementListener, advancedAchievements);
 		pluginManager.registerEvents(teleportListener, advancedAchievements);
-	}
+        pluginManager.registerEvents(jobsEnableWatcher, advancedAchievements);
+    }
 
 	/**
 	 * Links the plugin's custom command tab completer and command executor.

advanced-achievements-plugin/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: AdvancedAchievements
 main: com.hm.achievement.AdvancedAchievements
-version: 9.3
+version: 9.4
 author: LucidAPs
 softdepend: [Vault,PetMaster,Essentials,PlaceholderAPI,Jobs]
 description: Advanced Achievements enables unique and challenging achievements. Try to collect as many as you can, earn rewards, climb the rankings and receive RP books!

pom.xml

@@ -26,7 +26,7 @@
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>
 				<artifactId>formatter-maven-plugin</artifactId>
-				<version>2.24.1</version>
+				<version>2.29.0</version>
 				<configuration>
 					<configFile>${project.basedir}/../formatter-config.xml</configFile>
 					<compilerSource>${java.version}</compilerSource>
@@ -41,7 +41,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.13.0</version>
+					<version>3.14.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -95,7 +95,7 @@
 			<dependency>
 				<groupId>com.google.dagger</groupId>
 				<artifactId>dagger</artifactId>
-				<version>2.40</version>
+				<version>2.57.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
@@ -105,7 +105,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-text</artifactId>
-				<version>1.12.0</version>
+				<version>1.14.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.papermc.paper</groupId>
@@ -129,13 +129,13 @@
 			<dependency>
 				<groupId>com.github.Zrips</groupId>
 				<artifactId>Jobs</artifactId>
-				<version>v5.2.2.3</version>
+				<version>v5.2.6.2</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>net.essentialsx</groupId>
 				<artifactId>EssentialsX</artifactId>
-				<version>2.20.1</version>
+				<version>2.21.2</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -152,14 +152,26 @@
 			<dependency>
 				<groupId>com.h2database</groupId>
 				<artifactId>h2</artifactId>
-				<version>2.3.232</version>
+				<version>1.4.200</version>
 			</dependency>
 			<dependency>
-            			<groupId>com.tcoded</groupId>
-            			<artifactId>FoliaLib</artifactId>
-            			<version>0.5.1</version>
-            			<scope>compile</scope>
-        		</dependency>
+            	<groupId>com.tcoded</groupId>
+            	<artifactId>FoliaLib</artifactId>
+            	<version>0.5.1</version>
+            	<scope>compile</scope>
+        	</dependency>
+			<dependency>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter</artifactId>
+				<version>6.0.0</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-junit-jupiter</artifactId>
+				<version>5.20.0</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 </project>