Cleanup modules, bump version in plugin.yml

Author: leolifbom

blcmodapibukkit-1.17/src/main/resources/plugin.yml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blcmodapibukkit-1.17</artifactId>
+    <artifactId>bukkit-1.17</artifactId>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

blcmodapibukkit/src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
-package net.badlion.blcmodapibukkit;
+package net.badlion.bukkitapi;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -17,10 +17,10 @@
 import java.util.logging.Level;
 
 public class BukkitBadlionApi extends AbstractBadlionApi {
-	private final BlcModApiBukkit apiBukkit;
+	private final BukkitBadlionPlugin apiBukkit;
 	private Config config;
 
-	public BukkitBadlionApi(BlcModApiBukkit apiBukkit) {
+	public BukkitBadlionApi(BukkitBadlionPlugin apiBukkit) {
 		this.apiBukkit = apiBukkit;
 	}
 

blcmodapibungee/src/main/resources/plugin.yml

@@ -1,22 +1,22 @@
-package net.badlion.blcmodapibukkit;
+package net.badlion.bukkitapi;
 
-import net.badlion.blcmodapibukkit.listener.PlayerListener;
-import net.badlion.blcmodapibukkit.timers.TimerApi;
-import net.badlion.blcmodapibukkit.timers.TimerApiImpl;
-import net.badlion.blcmodapibukkit.waypoints.WaypointManager;
+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 BlcModApiBukkit extends JavaPlugin {
+public class BukkitBadlionPlugin extends JavaPlugin {
 	private final BukkitBadlionApi badlionApi;
 	private final BukkitPluginMessageSender messageSender;
 	private final TimerApiImpl timerApi;
 	private final WaypointManager waypointManager;
 
-	public BlcModApiBukkit() {
+	public BukkitBadlionPlugin() {
 		this.badlionApi = new BukkitBadlionApi(this);
 		this.messageSender = new BukkitPluginMessageSender(this);
 		this.timerApi = new TimerApiImpl(this);
@@ -51,14 +51,14 @@ public void onEnable() {
 			this.getServer().getScheduler().runTaskTimer(this, new Runnable() {
 				@Override
 				public void run() {
-					BlcModApiBukkit.this.getTimerApi().tickTimers();
+					BukkitBadlionPlugin.this.getTimerApi().tickTimers();
 				}
 			}, 1L, 1L);
 
 			this.getServer().getScheduler().runTaskTimer(this, new Runnable() {
 				@Override
 				public void run() {
-					BlcModApiBukkit.this.getTimerApi().syncTimers();
+					BukkitBadlionPlugin.this.getTimerApi().syncTimers();
 				}
 			}, 60L, 60L);
 

blcmodapibukkit-1.17/pom.xml bukkit-1.17/pom.xmlblcmodapibukkit-1.17/pom.xml renamed to bukkit-1.17/pom.xml

@@ -1,4 +1,4 @@
-package net.badlion.blcmodapibukkit;
+package net.badlion.bukkitapi;
 
 import net.badlion.modapicommon.AbstractPluginMessageSender;
 import org.bukkit.Bukkit;
@@ -13,7 +13,7 @@
 
 public class BukkitPluginMessageSender extends AbstractPluginMessageSender {
 
-	private final BlcModApiBukkit apiBukkit;
+	private final BukkitBadlionPlugin apiBukkit;
 
 	private final Method getHandleMethod;
 	private final Field playerConnectionField;
@@ -32,7 +32,7 @@ public class BukkitPluginMessageSender extends AbstractPluginMessageSender {
 	private Method wrappedBufferMethod;
 
 
-	public BukkitPluginMessageSender(BlcModApiBukkit apiBukkit) {
+	public BukkitPluginMessageSender(BukkitBadlionPlugin 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

…on/blcmodapibukkit/BukkitBadlionApi.java …/badlion/bukkitapi/BukkitBadlionApi.javablcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BukkitBadlionApi.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitBadlionApi.java blcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BukkitBadlionApi.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitBadlionApi.java

@@ -1,7 +1,7 @@
-package net.badlion.blcmodapibukkit.listener;
+package net.badlion.bukkitapi.listener;
 
-import net.badlion.blcmodapibukkit.BlcModApiBukkit;
-import net.badlion.blcmodapibukkit.timers.TimerApi;
+import net.badlion.bukkitapi.BukkitBadlionPlugin;
+import net.badlion.bukkitapi.timers.TimerApi;
 import net.badlion.modapicommon.AbstractBadlionApi;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,9 +16,9 @@
 import java.nio.charset.StandardCharsets;
 
 public class PlayerListener implements Listener {
-	private final BlcModApiBukkit plugin;
+	private final BukkitBadlionPlugin plugin;
 
-	public PlayerListener(BlcModApiBukkit plugin) {
+	public PlayerListener(BukkitBadlionPlugin plugin) {
 		this.plugin = plugin;
 	}
 

…ion/blcmodapibukkit/BlcModApiBukkit.java …dlion/bukkitapi/BukkitBadlionPlugin.javablcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BlcModApiBukkit.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitBadlionPlugin.java blcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BlcModApiBukkit.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitBadlionPlugin.java

@@ -1,4 +1,4 @@
-package net.badlion.blcmodapibukkit.timers;
+package net.badlion.bukkitapi.timers;
 
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

…apibukkit/BukkitPluginMessageSender.java …bukkitapi/BukkitPluginMessageSender.javablcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BukkitPluginMessageSender.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitPluginMessageSender.java blcmodapibukkit-1.17/src/main/java/net/badlion/blcmodapibukkit/BukkitPluginMessageSender.java renamed to bukkit-1.17/src/main/java/net/badlion/bukkitapi/BukkitPluginMessageSender.java

@@ -1,4 +1,4 @@
-package net.badlion.blcmodapibukkit.timers;
+package net.badlion.bukkitapi.timers;
 
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;