Merge pull request #82 from Sven65/feat/R3

Fix issue with worldguard flags not loading
Sven65 · Jan 23, 2024 · e7f4ab6 · e7f4ab6
2 parents 84b05a6 + 414b642
commit e7f4ab6
Show file tree

Hide file tree

Showing 31 changed files with 39 additions and 33 deletions.
diff --git a/modules/1_10_R1/pom.xml b/modules/1_10_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_11_R1/pom.xml b/modules/1_11_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_12_R1/pom.xml b/modules/1_12_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_13_R1/pom.xml b/modules/1_13_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_13_R2/pom.xml b/modules/1_13_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_14_R1/pom.xml b/modules/1_14_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_15_R1/pom.xml b/modules/1_15_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R1/pom.xml b/modules/1_16_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R2/pom.xml b/modules/1_16_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R3/pom.xml b/modules/1_16_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_17_R1/pom.xml b/modules/1_17_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_18_R1/pom.xml b/modules/1_18_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_18_R2/pom.xml b/modules/1_18_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_19_R1/pom.xml b/modules/1_19_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_19_R2/pom.xml b/modules/1_19_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_19_R3/pom.xml b/modules/1_19_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_20_R1/pom.xml b/modules/1_20_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_20_R2/pom.xml b/modules/1_20_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_20_R3/pom.xml b/modules/1_20_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/1_8_R1/pom.xml b/modules/1_8_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_8_R2/pom.xml b/modules/1_8_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_8_R3/pom.xml b/modules/1_8_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_9_R1/pom.xml b/modules/1_9_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_9_R2/pom.xml b/modules/1_9_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/Dist/pom.xml b/modules/Dist/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/Plugin/pom.xml b/modules/Plugin/pom.xml
@@ -12,21 +12,21 @@
     <parent>
         <artifactId>Slabbo-parent</artifactId>
         <groupId>xyz.mackan</groupId>
-        <version>1.0.50</version>
+        <version>1.0.51</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>xyz.mackan</groupId>
     <artifactId>Slabbo-plugin</artifactId>
-    <version>1.0.50</version>
+    <version>1.0.51</version>
     <packaging>jar</packaging>
 
     <description>Slab shops for spigot</description>
 
     <build>
         <plugins>
             <plugin>
-                <version>3.7.0</version>    
+                <version>3.7.0</version>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/Slabbo.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/Slabbo.java
@@ -55,6 +55,8 @@ public class Slabbo extends JavaPlugin {
 
 	@Override
 	public void onLoad () {
+		setupPluginSupport();
+
 		if (PluginSupport.isPluginEnabled("WorldGuard")) {
 			WorldguardSupport.registerFlags();
 		}
@@ -69,7 +71,6 @@ public void onEnable () {
 		}
 
 		loadAPI();
-		setupPluginSupport();
 
 		new File(getDataPath()).mkdirs();
 
@@ -86,10 +87,9 @@ public void onEnable () {
 		setupCommands();
 		setupListeners();
 
-
 		checkUpdates();
 
-		getLogger().info("Slabbo enabled.");
+		getLogger().info("Slabbo fully enabled.");
 
 		ShopManager.loadShops();
 

diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/pluginsupport/PluginSupport.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/pluginsupport/PluginSupport.java
@@ -35,7 +35,12 @@ public static boolean isPluginEnabled (String pluginName) {
 	}
 
 	public static void checkPlugin(String pluginName) {
+		Slabbo.log.info(String.format("Checking for plugin %s", pluginName));
+
 		if (getServer().getPluginManager().getPlugin(pluginName) == null) return;
+
+		Slabbo.log.info(String.format("Plugin %s found. Enabling support.", pluginName));
+
 		pluginStatus.put(pluginName, true);
 	}
 

diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/pluginsupport/WorldguardSupport.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/pluginsupport/WorldguardSupport.java
@@ -17,6 +17,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import xyz.mackan.Slabbo.Slabbo;
 import xyz.mackan.Slabbo.manager.LocaleManager;
 import xyz.mackan.Slabbo.manager.ShopManager;
 import xyz.mackan.Slabbo.types.Shop;

diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/utils/UpdateChecker.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/utils/UpdateChecker.java
@@ -20,7 +20,7 @@ public static void getVersion (final Consumer<String> consumer) {
 					consumer.accept(scanner.next());
 				}
 			} catch (IOException exception) {
-				Slabbo.getInstance().getLogger().info("Cannot look for updates: " + exception.getMessage());
+				Slabbo.log.info("Cannot look for updates: " + exception.getMessage());
 			}
 		});
 	}

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>xyz.mackan</groupId>
     <artifactId>Slabbo-parent</artifactId>
-    <version>1.0.50</version>
+    <version>1.0.51</version>
     <packaging>pom</packaging>
     <name>Slabbo</name>