[Bukkit/Common] Moved all the bukkit code to a common module and cleaned up build warnings

Author: Rigner

bukkit-1.17/pom.xml

@@ -59,7 +59,7 @@
     <dependencies>
         <dependency>
             <groupId>net.badlion</groupId>
-            <artifactId>modapi-common</artifactId>
+            <artifactId>bukkit-common</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>

bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitBadlionPlugin.java

@@ -1,95 +1,7 @@
 package net.badlion.bukkitapi;
 
-import net.badlion.bukkitapi.cosmetics.CosmeticManager;
-import net.badlion.bukkitapi.listener.PlayerListener;
-import net.badlion.bukkitapi.timers.TimerApi;
-import net.badlion.bukkitapi.timers.TimerApiImpl;
-import net.badlion.bukkitapi.waypoints.WaypointManager;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-
-public class BukkitBadlionPlugin extends JavaPlugin {
-	private final BukkitBadlionApi badlionApi;
-	private final BukkitPluginMessageSender messageSender;
-	private final TimerApiImpl timerApi;
-	private final WaypointManager waypointManager;
-	private final CosmeticManager cosmeticManager;
-
+public class BukkitBadlionPlugin extends AbstractBukkitBadlionPlugin {
 	public BukkitBadlionPlugin() {
-		this.badlionApi = new BukkitBadlionApi(this);
-		this.messageSender = new BukkitPluginMessageSender(this);
-		this.timerApi = new TimerApiImpl(this);
-		this.waypointManager = new WaypointManager(this);
-		this.badlionApi.setWaypointManager(this.waypointManager);
-		this.cosmeticManager = new CosmeticManager();
-		this.badlionApi.setCosmeticManager(this.cosmeticManager);
-	}
-
-	@Override
-	public void onEnable() {
-		if (!this.getDataFolder().exists()) {
-			if (!this.getDataFolder().mkdir()) {
-				this.getLogger().log(Level.SEVERE, "Failed to create plugin directory.");
-			}
-		}
-
-		try {
-			this.badlionApi.loadConfig(new File(this.getDataFolder(), "config.json"));
-
-			this.waypointManager.loadWaypoints();
-
-			// Register channel
-			this.getServer().getMessenger().registerOutgoingPluginChannel(this, "badlion:mods");
-			this.getServer().getMessenger().registerOutgoingPluginChannel(this, "badlion:modapi");
-			this.getServer().getMessenger().registerOutgoingPluginChannel(this, TimerApi.CHANNEL_NAME);
-
-			// Only register the listener if the config loads successfully
-			this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
-			this.getServer().getPluginManager().registerEvents(this.waypointManager, this);
-			this.getServer().getPluginManager().registerEvents(this.cosmeticManager, this);
-
-			this.getServer().getScheduler().runTaskTimer(this, new Runnable() {
-				@Override
-				public void run() {
-					BukkitBadlionPlugin.this.getTimerApi().tickTimers();
-				}
-			}, 1L, 1L);
-
-			this.getServer().getScheduler().runTaskTimer(this, new Runnable() {
-				@Override
-				public void run() {
-					BukkitBadlionPlugin.this.getTimerApi().syncTimers();
-				}
-			}, 60L, 60L);
-
-			this.getLogger().log(Level.INFO, "Successfully setup BadlionClientModAPI plugin.");
-
-		} catch (IOException e) {
-			this.getLogger().log(Level.SEVERE, "Error with config for BadlionClientModAPI plugin.");
-			e.printStackTrace();
-		}
-	}
-
-	public BukkitBadlionApi getBadlionApi() {
-		return this.badlionApi;
-	}
-
-	public BukkitPluginMessageSender getMessageSender() {
-		return this.messageSender;
-	}
-
-	public TimerApiImpl getTimerApi() {
-		return this.timerApi;
-	}
-
-	public WaypointManager getWaypointManager() {
-		return this.waypointManager;
-	}
-
-	public CosmeticManager getCosmeticManager() {
-		return this.cosmeticManager;
+		this.setMessageSender(new BukkitPluginMessageSender(this));
 	}
-}
+}

bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitPluginMessageSender.java

@@ -1,6 +1,5 @@
 package net.badlion.bukkitapi;
 
-import net.badlion.modapicommon.AbstractPluginMessageSender;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -9,11 +8,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.UUID;
 
-public class BukkitPluginMessageSender extends AbstractPluginMessageSender {
+public class BukkitPluginMessageSender extends AbstractBukkitPluginMessageSender {
 
-	private final BukkitBadlionPlugin apiBukkit;
+	private final AbstractBukkitBadlionPlugin apiBukkit;
 
 	private final Method getHandleMethod;
 	private final Field playerConnectionField;
@@ -32,7 +30,7 @@ public class BukkitPluginMessageSender extends AbstractPluginMessageSender {
 	private Method wrappedBufferMethod;
 
 
-	public BukkitPluginMessageSender(BukkitBadlionPlugin apiBukkit) {
+	public BukkitPluginMessageSender(AbstractBukkitBadlionPlugin apiBukkit) {
 		this.apiBukkit = apiBukkit;
 
 		// Get the v1_X_Y from the end of the package name, e.g. v_1_7_R4 or v_1_12_R1
@@ -145,21 +143,6 @@ public BukkitPluginMessageSender(BukkitBadlionPlugin apiBukkit) {
 	}
 
 	@Override
-	public void sendPluginMessage(byte[] data) {
-		for (Player player : Bukkit.getOnlinePlayers()) {
-			this.sendPluginMessagePacket(player, "badlion:modapi", data);
-		}
-	}
-
-	@Override
-	public void sendPluginMessage(UUID player, byte[] data) {
-		final Player bukkitPlayer = Bukkit.getPlayer(player);
-
-		if (bukkitPlayer != null) {
-			this.sendPluginMessagePacket(bukkitPlayer, "badlion:modapi", data);
-		}
-	}
-
 	public void sendPluginMessagePacket(Player player, String channel, Object data) {
 		try {
 			Object packet;