Merge pull request #5 from ModularSoftAU/refactor-msau

Refactor to org.modularsoft.MobHunt and updated to latest supported version.
ModularSoftAU · Apr 14, 2024 · c3ac495 · c3ac495
2 parents fb1cb91 + 8b02faa
commit c3ac495
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.18.2-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.23</version>
+            <version>8.0.33</version>
         </dependency>
 
         <dependency>

diff --git a/...dularenigma/MobHunt/HunterController.java → ...modularsoft/MobHunt/HunterController.java b/...dularenigma/MobHunt/HunterController.java → ...modularsoft/MobHunt/HunterController.java
@@ -1,6 +1,6 @@
-package com.modularenigma.MobHunt;
+package org.modularsoft.MobHunt;
 
-import com.modularenigma.MobHunt.helpers.DefaultFontInfo;
+import org.modularsoft.MobHunt.helpers.DefaultFontInfo;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;

diff --git a/...om/modularenigma/MobHunt/MobHuntMain.java → .../org/modularsoft/MobHunt/MobHuntMain.java b/...om/modularenigma/MobHunt/MobHuntMain.java → .../org/modularsoft/MobHunt/MobHuntMain.java
@@ -1,11 +1,11 @@
-package com.modularenigma.MobHunt;
+package org.modularsoft.MobHunt;
 
-import com.modularenigma.MobHunt.commands.mobclear;
-import com.modularenigma.MobHunt.commands.mobhelp;
-import com.modularenigma.MobHunt.commands.mobstats;
-import com.modularenigma.MobHunt.commands.mobleaderboard;
-import com.modularenigma.MobHunt.events.OnHunterJoin;
-import com.modularenigma.MobHunt.events.OnMobKill;
+import org.modularsoft.MobHunt.commands.mobclear;
+import org.modularsoft.MobHunt.commands.mobhelp;
+import org.modularsoft.MobHunt.commands.mobstats;
+import org.modularsoft.MobHunt.commands.mobleaderboard;
+import org.modularsoft.MobHunt.events.OnHunterJoin;
+import org.modularsoft.MobHunt.events.OnMobKill;
 import com.mysql.cj.jdbc.MysqlDataSource;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

diff --git a/...m/modularenigma/MobHunt/MobHuntQuery.java → ...org/modularsoft/MobHunt/MobHuntQuery.java b/...m/modularenigma/MobHunt/MobHuntQuery.java → ...org/modularsoft/MobHunt/MobHuntQuery.java
@@ -1,4 +1,4 @@
-package com.modularenigma.MobHunt;
+package org.modularsoft.MobHunt;
 
 import lombok.Getter;
 import org.bukkit.command.CommandSender;

diff --git a/...m/modularenigma/MobHunt/PluginConfig.java → ...org/modularsoft/MobHunt/PluginConfig.java b/...m/modularenigma/MobHunt/PluginConfig.java → ...org/modularsoft/MobHunt/PluginConfig.java
@@ -1,6 +1,6 @@
-package com.modularenigma.MobHunt;
+package org.modularsoft.MobHunt;
 
-import com.modularenigma.MobHunt.helpers.CollectionMilestone;
+import org.modularsoft.MobHunt.helpers.CollectionMilestone;
 import lombok.Getter;
 import org.bukkit.ChatColor;
 import org.bukkit.Sound;

diff --git a/...renigma/MobHunt/ScoreboardController.java → ...larsoft/MobHunt/ScoreboardController.java b/...renigma/MobHunt/ScoreboardController.java → ...larsoft/MobHunt/ScoreboardController.java
@@ -1,4 +1,4 @@
-package com.modularenigma.MobHunt;
+package org.modularsoft.MobHunt;
 
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;

diff --git a/...ularenigma/MobHunt/commands/mobclear.java → ...odularsoft/MobHunt/commands/mobclear.java b/...ularenigma/MobHunt/commands/mobclear.java → ...odularsoft/MobHunt/commands/mobclear.java
@@ -1,15 +1,16 @@
-package com.modularenigma.MobHunt.commands;
+package org.modularsoft.MobHunt.commands;
 
-import com.modularenigma.MobHunt.MobHuntMain;
-import com.modularenigma.MobHunt.ScoreboardController;
-import com.modularenigma.MobHunt.*;
+import org.modularsoft.MobHunt.MobHuntMain;
+import org.modularsoft.MobHunt.ScoreboardController;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.modularsoft.MobHunt.HunterController;
+import org.modularsoft.MobHunt.MobHuntQuery;
 
 public class mobclear implements CommandExecutor {
     private final MobHuntMain plugin;
@@ -36,7 +37,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
         }
 
         // If another argument is present, clear the stats of another player.
-        // By using OfflinePlater, we can remove the stats of a player who is not
+        // By using OfflinePlayer, we can remove the stats of a player who is not
         // currently online.
         if (args.length > 0) {
             // Check to see if the player has logged in before.

diff --git a/...dularenigma/MobHunt/commands/mobhelp.java → ...modularsoft/MobHunt/commands/mobhelp.java b/...dularenigma/MobHunt/commands/mobhelp.java → ...modularsoft/MobHunt/commands/mobhelp.java
@@ -1,12 +1,9 @@
-package com.modularenigma.MobHunt.commands;
+package org.modularsoft.MobHunt.commands;
 
-import com.modularenigma.MobHunt.HunterController;
-import com.modularenigma.MobHunt.MobHuntMain;
-import com.modularenigma.MobHunt.MobHuntQuery;
+import org.modularsoft.MobHunt.HunterController;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class mobhelp implements CommandExecutor {

diff --git a/...igma/MobHunt/commands/mobleaderboard.java → ...soft/MobHunt/commands/mobleaderboard.java b/...igma/MobHunt/commands/mobleaderboard.java → ...soft/MobHunt/commands/mobleaderboard.java
@@ -1,14 +1,14 @@
-package com.modularenigma.MobHunt.commands;
+package org.modularsoft.MobHunt.commands;
 
-import com.modularenigma.MobHunt.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.modularsoft.MobHunt.HunterController;
+import org.modularsoft.MobHunt.MobHuntMain;
+import org.modularsoft.MobHunt.MobHuntQuery;
 
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 public class mobleaderboard implements CommandExecutor {

diff --git a/...ularenigma/MobHunt/commands/mobstats.java → ...odularsoft/MobHunt/commands/mobstats.java b/...ularenigma/MobHunt/commands/mobstats.java → ...odularsoft/MobHunt/commands/mobstats.java
@@ -1,8 +1,8 @@
-package com.modularenigma.MobHunt.commands;
+package org.modularsoft.MobHunt.commands;
 
-import com.modularenigma.MobHunt.MobHuntMain;
-import com.modularenigma.MobHunt.HunterController;
-import com.modularenigma.MobHunt.MobHuntQuery;
+import org.modularsoft.MobHunt.MobHuntMain;
+import org.modularsoft.MobHunt.HunterController;
+import org.modularsoft.MobHunt.MobHuntQuery;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

diff --git a/...arenigma/MobHunt/events/OnHunterJoin.java → ...ularsoft/MobHunt/events/OnHunterJoin.java b/...arenigma/MobHunt/events/OnHunterJoin.java → ...ularsoft/MobHunt/events/OnHunterJoin.java
@@ -1,9 +1,9 @@
-package com.modularenigma.MobHunt.events;
+package org.modularsoft.MobHunt.events;
 
-import com.modularenigma.MobHunt.MobHuntMain;
-import com.modularenigma.MobHunt.HunterController;
-import com.modularenigma.MobHunt.MobHuntQuery;
-import com.modularenigma.MobHunt.ScoreboardController;
+import org.modularsoft.MobHunt.MobHuntMain;
+import org.modularsoft.MobHunt.HunterController;
+import org.modularsoft.MobHunt.MobHuntQuery;
+import org.modularsoft.MobHunt.ScoreboardController;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/...dularenigma/MobHunt/events/OnMobKill.java → ...modularsoft/MobHunt/events/OnMobKill.java b/...dularenigma/MobHunt/events/OnMobKill.java → ...modularsoft/MobHunt/events/OnMobKill.java
@@ -1,12 +1,15 @@
-package com.modularenigma.MobHunt.events;
+package org.modularsoft.MobHunt.events;
 
-import com.modularenigma.MobHunt.*;
-import com.modularenigma.MobHunt.helpers.CollectionMilestone;
+import org.modularsoft.MobHunt.helpers.CollectionMilestone;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
+import org.modularsoft.MobHunt.HunterController;
+import org.modularsoft.MobHunt.MobHuntMain;
+import org.modularsoft.MobHunt.MobHuntQuery;
+import org.modularsoft.MobHunt.ScoreboardController;
 
 import java.util.List;
 

diff --git a/.../MobHunt/helpers/CollectionMilestone.java → .../MobHunt/helpers/CollectionMilestone.java b/.../MobHunt/helpers/CollectionMilestone.java → .../MobHunt/helpers/CollectionMilestone.java
@@ -1,6 +1,6 @@
-package com.modularenigma.MobHunt.helpers;
+package org.modularsoft.MobHunt.helpers;
 
-import com.modularenigma.MobHunt.HunterController;
+import org.modularsoft.MobHunt.HunterController;
 import lombok.Getter;
 import org.bukkit.entity.Player;
 

diff --git a/...igma/MobHunt/helpers/DefaultFontInfo.java → ...soft/MobHunt/helpers/DefaultFontInfo.java b/...igma/MobHunt/helpers/DefaultFontInfo.java → ...soft/MobHunt/helpers/DefaultFontInfo.java
@@ -1,4 +1,4 @@
-package com.modularenigma.MobHunt.helpers;
+package org.modularsoft.MobHunt.helpers;
 
 /**
  * From https://www.spigotmc.org/threads/free-code-sending-perfectly-centered-chat-message.95872/

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,9 +1,9 @@
-main: com.modularenigma.MobHunt.MobHuntMain
+main: org.modularsoft.MobHunt.MobHuntMain
 name: MobHunt
 description: Hunt as many mobs overall, or of a unique mob type.
 version: ${project.version}
-authors: [ModularEnigma]
-api-version: 1.18
+authors: [ModularSoft]
+api-version: 1.20
 
 commands:
   mobstats: