Ajout partie Velocity + TAB dans le velocity

VeryMC · Aug 1, 2022 · a5a521e · a5a521e
1 parent a4fcd5c
commit a5a521e
Show file tree

Hide file tree

Showing 180 changed files with 907 additions and 716 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target/
 /.idea/
 /Commons/
+/dependency-reduced-pom.xml
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,10 @@
             <id>codemc-repo</id>
             <url>https://repo.codemc.io/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -78,6 +82,12 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.13</version>
         </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -90,6 +100,19 @@
                     <release>16</release>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/fr/verymc/core/scoreboard/TABManager.java b/src/main/java/fr/verymc/core/scoreboard/TABManager.java
diff --git a/src/main/java/fr/verymc/Main.java → src/main/java/fr/verymc/spigot/Main.java b/src/main/java/fr/verymc/Main.java → src/main/java/fr/verymc/spigot/Main.java
@@ -1,71 +1,70 @@
-package main.java.fr.verymc;
+package main.java.fr.verymc.spigot;
 
 import com.gmail.filoghost.holographicdisplays.api.Hologram;
 import com.gmail.filoghost.holographicdisplays.api.HologramsAPI;
 import main.java.fr.verymc.commons.enums.ServerType;
 import main.java.fr.verymc.commons.utils.HTTPUtils;
-import main.java.fr.verymc.core.PluginMessageManager;
-import main.java.fr.verymc.core.ServersManager;
-import main.java.fr.verymc.core.antiafk.AntiAfk;
-import main.java.fr.verymc.core.atout.AtoutCmd;
-import main.java.fr.verymc.core.atout.AtoutGui;
-import main.java.fr.verymc.core.atout.BuyAtoutGui;
-import main.java.fr.verymc.core.auctions.AhCmd;
-import main.java.fr.verymc.core.auctions.AuctionGui;
-import main.java.fr.verymc.core.auctions.AuctionsManager;
-import main.java.fr.verymc.core.cmd.base.*;
-import main.java.fr.verymc.core.cmd.moderation.*;
-import main.java.fr.verymc.core.eco.EcoAccountsManager;
-import main.java.fr.verymc.core.evenement.ChatReaction;
-import main.java.fr.verymc.core.evenement.EventManager;
-import main.java.fr.verymc.core.events.JoinLeave;
-import main.java.fr.verymc.core.events.ServerCoreMicellanous;
-import main.java.fr.verymc.core.events.Tabulation;
-import main.java.fr.verymc.core.events.TchatManager;
-import main.java.fr.verymc.core.featherfly.CountdownFly;
-import main.java.fr.verymc.core.featherfly.DailyFlyCmd;
-import main.java.fr.verymc.core.featherfly.FeatherFlyCmd;
-import main.java.fr.verymc.core.featherfly.FeatherFlyInteract;
-import main.java.fr.verymc.core.gui.*;
-import main.java.fr.verymc.core.holos.HolosSetup;
-import main.java.fr.verymc.core.items.*;
-import main.java.fr.verymc.core.playerwarps.PlayerWarpCmd;
-import main.java.fr.verymc.core.playerwarps.PlayerWarpGuiManager;
-import main.java.fr.verymc.core.playerwarps.PlayerWarpManager;
-import main.java.fr.verymc.core.scoreboard.ScoreBoard;
-import main.java.fr.verymc.core.scoreboard.TABManager;
-import main.java.fr.verymc.core.shopgui.*;
-import main.java.fr.verymc.core.storage.ConfigManager;
-import main.java.fr.verymc.core.storage.SkyblockUser;
-import main.java.fr.verymc.core.storage.SkyblockUserManager;
-import main.java.fr.verymc.core.storage.StorageJSONManager;
-import main.java.fr.verymc.hub.crates.CratesManager;
-import main.java.fr.verymc.hub.crates.KeyCmd;
-import main.java.fr.verymc.hub.events.AntiExplo;
-import main.java.fr.verymc.hub.events.Interact;
-import main.java.fr.verymc.hub.invest.InvestCmd;
-import main.java.fr.verymc.hub.invest.InvestManager;
-import main.java.fr.verymc.hub.winelottery.WineGui;
-import main.java.fr.verymc.hub.winelottery.WineSpawn;
-import main.java.fr.verymc.island.Island;
-import main.java.fr.verymc.island.IslandManager;
-import main.java.fr.verymc.island.blocks.ChestListener;
-import main.java.fr.verymc.island.blocks.ChestManager;
-import main.java.fr.verymc.island.blocks.ChestsCmd;
-import main.java.fr.verymc.island.challenges.ChallengesCmd;
-import main.java.fr.verymc.island.challenges.IslandChallengesGuis;
-import main.java.fr.verymc.island.challenges.IslandChallengesListener;
-import main.java.fr.verymc.island.events.IslandGeneratorForm;
-import main.java.fr.verymc.island.events.IslandInteractManager;
-import main.java.fr.verymc.island.events.IslandPlayerMove;
-import main.java.fr.verymc.island.generator.EmptyChunkGenerator;
-import main.java.fr.verymc.island.guis.IslandGuiManager;
-import main.java.fr.verymc.island.minions.MinionManager;
-import main.java.fr.verymc.island.minions.MinionsCmd;
-import main.java.fr.verymc.island.minions.MinionsListener;
-import main.java.fr.verymc.island.protections.BlockListener;
-import main.java.fr.verymc.island.protections.EntityListener;
-import main.java.fr.verymc.utils.UtilsManager;
+import main.java.fr.verymc.spigot.core.PluginMessageManager;
+import main.java.fr.verymc.spigot.core.ServersManager;
+import main.java.fr.verymc.spigot.core.antiafk.AntiAfk;
+import main.java.fr.verymc.spigot.core.atout.AtoutCmd;
+import main.java.fr.verymc.spigot.core.atout.AtoutGui;
+import main.java.fr.verymc.spigot.core.atout.BuyAtoutGui;
+import main.java.fr.verymc.spigot.core.auctions.AhCmd;
+import main.java.fr.verymc.spigot.core.auctions.AuctionGui;
+import main.java.fr.verymc.spigot.core.auctions.AuctionsManager;
+import main.java.fr.verymc.spigot.core.cmd.base.*;
+import main.java.fr.verymc.spigot.core.cmd.moderation.*;
+import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager;
+import main.java.fr.verymc.spigot.core.evenement.ChatReaction;
+import main.java.fr.verymc.spigot.core.evenement.EventManager;
+import main.java.fr.verymc.spigot.core.events.JoinLeave;
+import main.java.fr.verymc.spigot.core.events.ServerCoreMicellanous;
+import main.java.fr.verymc.spigot.core.events.Tabulation;
+import main.java.fr.verymc.spigot.core.events.TchatManager;
+import main.java.fr.verymc.spigot.core.gui.*;
+import main.java.fr.verymc.spigot.core.holos.HolosSetup;
+import main.java.fr.verymc.spigot.core.items.*;
+import main.java.fr.verymc.spigot.core.scoreboard.ScoreBoard;
+import main.java.fr.verymc.spigot.core.shopgui.*;
+import main.java.fr.verymc.spigot.core.storage.ConfigManager;
+import main.java.fr.verymc.spigot.core.storage.SkyblockUser;
+import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager;
+import main.java.fr.verymc.spigot.core.storage.StorageJSONManager;
+import main.java.fr.verymc.spigot.hub.crates.CratesManager;
+import main.java.fr.verymc.spigot.hub.crates.KeyCmd;
+import main.java.fr.verymc.spigot.hub.events.AntiExplo;
+import main.java.fr.verymc.spigot.hub.events.Interact;
+import main.java.fr.verymc.spigot.hub.invest.InvestCmd;
+import main.java.fr.verymc.spigot.hub.invest.InvestManager;
+import main.java.fr.verymc.spigot.hub.winelottery.WineGui;
+import main.java.fr.verymc.spigot.hub.winelottery.WineSpawn;
+import main.java.fr.verymc.spigot.island.Island;
+import main.java.fr.verymc.spigot.island.IslandManager;
+import main.java.fr.verymc.spigot.island.blocks.ChestListener;
+import main.java.fr.verymc.spigot.island.blocks.ChestManager;
+import main.java.fr.verymc.spigot.island.blocks.ChestsCmd;
+import main.java.fr.verymc.spigot.island.challenges.ChallengesCmd;
+import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis;
+import main.java.fr.verymc.spigot.island.challenges.IslandChallengesListener;
+import main.java.fr.verymc.spigot.island.events.IslandGeneratorForm;
+import main.java.fr.verymc.spigot.island.events.IslandInteractManager;
+import main.java.fr.verymc.spigot.island.events.IslandPlayerMove;
+import main.java.fr.verymc.spigot.island.featherfly.CountdownFly;
+import main.java.fr.verymc.spigot.island.featherfly.DailyFlyCmd;
+import main.java.fr.verymc.spigot.island.featherfly.FeatherFlyCmd;
+import main.java.fr.verymc.spigot.island.featherfly.FeatherFlyInteract;
+import main.java.fr.verymc.spigot.island.generator.EmptyChunkGenerator;
+import main.java.fr.verymc.spigot.island.guis.IslandGuiManager;
+import main.java.fr.verymc.spigot.island.minions.MinionManager;
+import main.java.fr.verymc.spigot.island.minions.MinionsCmd;
+import main.java.fr.verymc.spigot.island.minions.MinionsListener;
+import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpCmd;
+import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpGuiManager;
+import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpManager;
+import main.java.fr.verymc.spigot.island.protections.BlockListener;
+import main.java.fr.verymc.spigot.island.protections.EntityListener;
+import main.java.fr.verymc.spigot.utils.UtilsManager;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
 import net.luckperms.api.LuckPerms;
@@ -222,8 +221,6 @@ public void onEnable() {
 
         startCommandModule();
 
-        new TABManager();
-
         new EventManager();
 
         new ChestManager();
@@ -242,7 +239,7 @@ public void onEnable() {
 
 
         //ISLAND ADDITIONNAL STARTUP
-        if (serverType == ServerType.ISLAND) {
+        if (serverType == ServerType.SKYBLOCK_ISLAND) {
             System.out.println("Starting Island ADDITIONNAL module...");
             IslandManager.instance.load();
             for (Island island : IslandManager.instance.islands) {
@@ -254,7 +251,7 @@ public void onEnable() {
         }
 
         //HUB ADDITIONNAL STARTUP
-        if (serverType == ServerType.HUB) {
+        if (serverType == ServerType.SKYBLOCK_HUB) {
             System.out.println("Starting Hub ADDITIONNAL module...");
             Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
                 @Override
@@ -272,7 +269,7 @@ public void run() {
 
 
         //Dungeon ADDITIONNAL STARTUP
-        if (serverType == ServerType.DUNGEON) {
+        if (serverType == ServerType.SKYBLOCk_DUNGEON) {
             System.out.println("Starting Dungeon ADDITIONNAL module...");
 
             System.out.println("Starting Dungeon ADDITIONNAL module FINISHED");
@@ -306,7 +303,7 @@ public void run() {
 
     @Override
     public void onDisable() {
-        if (serverType == ServerType.ISLAND) {
+        if (serverType == ServerType.SKYBLOCK_ISLAND) {
             IslandManager.instance.saveAllIslands();
         }
         for (SkyblockUser user : SkyblockUserManager.instance.users) {
@@ -372,7 +369,7 @@ public void startListenerModule() {
 
 
         //ISLAND LISTENER
-        if (serverType == ServerType.ISLAND) {
+        if (serverType == ServerType.SKYBLOCK_ISLAND) {
             getServer().getPluginManager().registerEvents(new Farm2WinGui(), this);
             getServer().getPluginManager().registerEvents(new WineGui(), this);
             getServer().getPluginManager().registerEvents(new WarpGui(), this);
@@ -389,7 +386,7 @@ public void startListenerModule() {
 
 
         //HUB LISTENER
-        if (serverType == ServerType.HUB) {
+        if (serverType == ServerType.SKYBLOCK_HUB) {
             getServer().getPluginManager().registerEvents(new Interact(), this);
             getServer().getPluginManager().registerEvents(new AntiExplo(), this);
             getServer().getPluginManager().registerEvents(new CratesManager(), this);
@@ -398,7 +395,7 @@ public void startListenerModule() {
 
 
         //DUNGEON LISTENER
-        if (serverType == ServerType.DUNGEON) {
+        if (serverType == ServerType.SKYBLOCk_DUNGEON) {
 
         }
 
@@ -471,7 +468,7 @@ public void createMainWorld() {
         WorldCreator wc = new WorldCreator(serverType.getDisplayName());
         wc.generator(new EmptyChunkGenerator());
         mainWorld = wc.createWorld();
-        if (serverType == ServerType.HUB) {
+        if (serverType == ServerType.SKYBLOCK_HUB) {
             for (File file : Main.instance.getDataFolder().listFiles()) {
                 if (file.getName().contains("spawn")) {
                     IslandManager.instance.pasteIsland(file, SpawnCmd.Spawn.clone().add(0, -1, 0));

diff --git a/.../fr/verymc/core/PluginMessageManager.java → ...ymc/spigot/core/PluginMessageManager.java b/.../fr/verymc/core/PluginMessageManager.java → ...ymc/spigot/core/PluginMessageManager.java
@@ -1,10 +1,10 @@
-package main.java.fr.verymc.core;
+package main.java.fr.verymc.spigot.core;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import main.java.fr.verymc.Main;
-import main.java.fr.verymc.utils.ObjectConverter;
+import main.java.fr.verymc.spigot.Main;
+import main.java.fr.verymc.spigot.utils.ObjectConverter;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;

diff --git a/...n/java/fr/verymc/core/ServersManager.java → ...fr/verymc/spigot/core/ServersManager.java b/...n/java/fr/verymc/core/ServersManager.java → ...fr/verymc/spigot/core/ServersManager.java
@@ -1,12 +1,12 @@
-package main.java.fr.verymc.core;
+package main.java.fr.verymc.spigot.core;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import main.java.fr.verymc.Main;
 import main.java.fr.verymc.commons.enums.ServerType;
 import main.java.fr.verymc.commons.utils.HTTPUtils;
-import main.java.fr.verymc.island.IslandManager;
-import main.java.fr.verymc.utils.ObjectConverter;
+import main.java.fr.verymc.spigot.Main;
+import main.java.fr.verymc.spigot.island.IslandManager;
+import main.java.fr.verymc.spigot.utils.ObjectConverter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -32,7 +32,7 @@ public ServersManager() {
             @Override
             public void run() {
                 try {
-                    if (Main.instance.serverType == ServerType.ISLAND) {
+                    if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) {
                         autoSendPlayers();
                     }
                     autoReadServers();

diff --git a/.../java/fr/verymc/core/antiafk/AntiAfk.java → ...r/verymc/spigot/core/antiafk/AntiAfk.java b/.../java/fr/verymc/core/antiafk/AntiAfk.java → ...r/verymc/spigot/core/antiafk/AntiAfk.java
@@ -1,10 +1,10 @@
-package main.java.fr.verymc.core.antiafk;
+package main.java.fr.verymc.spigot.core.antiafk;
 
-import main.java.fr.verymc.Main;
 import main.java.fr.verymc.commons.enums.ServerType;
-import main.java.fr.verymc.core.cmd.base.SpawnCmd;
-import main.java.fr.verymc.core.gui.AfkMineCaptchaGui;
-import main.java.fr.verymc.utils.PlayerUtils;
+import main.java.fr.verymc.spigot.Main;
+import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd;
+import main.java.fr.verymc.spigot.core.gui.AfkMineCaptchaGui;
+import main.java.fr.verymc.spigot.utils.PlayerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -57,7 +57,7 @@ public void run() {
                             Bukkit.getScheduler().scheduleSyncDelayedTask(Main.instance, new Runnable() {
                                 @Override
                                 public void run() {
-                                    PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.HUB);
+                                    PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB);
                                 }
                             }, 0);
                             countHashMap.remove(entry.getKey());

diff --git a/...n/java/fr/verymc/core/atout/AtoutCmd.java → ...fr/verymc/spigot/core/atout/AtoutCmd.java b/...n/java/fr/verymc/core/atout/AtoutCmd.java → ...fr/verymc/spigot/core/atout/AtoutCmd.java
@@ -1,4 +1,4 @@
-package main.java.fr.verymc.core.atout;
+package main.java.fr.verymc.spigot.core.atout;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

diff --git a/...n/java/fr/verymc/core/atout/AtoutGui.java → ...fr/verymc/spigot/core/atout/AtoutGui.java b/...n/java/fr/verymc/core/atout/AtoutGui.java → ...fr/verymc/spigot/core/atout/AtoutGui.java
@@ -1,9 +1,9 @@
-package main.java.fr.verymc.core.atout;
+package main.java.fr.verymc.spigot.core.atout;
 
-import main.java.fr.verymc.Main;
-import main.java.fr.verymc.core.gui.MenuGui;
-import main.java.fr.verymc.core.storage.SkyblockUser;
-import main.java.fr.verymc.core.storage.SkyblockUserManager;
+import main.java.fr.verymc.spigot.Main;
+import main.java.fr.verymc.spigot.core.gui.MenuGui;
+import main.java.fr.verymc.spigot.core.storage.SkyblockUser;
+import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;