remove APIManager

Author: InventivetalentDev

API/pom.xml

@@ -36,12 +36,7 @@
         <dependency>
             <groupId>org.inventivetalent</groupId>
             <artifactId>reflectionhelper</artifactId>
-            <version>1.17.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.inventivetalent</groupId>
-            <artifactId>apimanager</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.17.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>

API/src/org/inventivetalent/packetlistener/PacketListenerAPI.java

@@ -8,24 +8,21 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
-import org.inventivetalent.apihelper.API;
-import org.inventivetalent.apihelper.APIManager;
 import org.inventivetalent.packetlistener.channel.ChannelWrapper;
 import org.inventivetalent.packetlistener.handler.PacketHandler;
 import org.inventivetalent.packetlistener.handler.ReceivedPacket;
 import org.inventivetalent.packetlistener.handler.SentPacket;
 
 import java.util.logging.Logger;
 
-public class PacketListenerAPI /*extends JavaPlugin*/ implements IPacketListener, Listener, API {
+public class PacketListenerAPI /*extends JavaPlugin*/ implements IPacketListener, Listener {
 
 	private ChannelInjector channelInjector;
 	protected boolean injected = false;
 
 	Logger logger = Logger.getLogger("PacketListenerAPI");
 
 	//This gets called either by #registerAPI above, or by the API manager if another plugin requires this API
-	@Override
 	public void load() {
 		if (injected) {
 			System.err.println("Already Injected! Restart your server, do not /reload");
@@ -42,10 +39,8 @@ public void load() {
 	}
 
 	//This gets called either by #initAPI above or #initAPI in one of the requiring plugins
-	@Override
 	public void init(Plugin plugin) {
-		//Register our events
-		APIManager.registerEvents(this, this);
+		Bukkit.getPluginManager().registerEvents(this, plugin);
 
 		logger.info("Adding channels for online players...");
 		for (Player player : Bukkit.getOnlinePlayers()) {
@@ -54,7 +49,6 @@ public void init(Plugin plugin) {
 	}
 
 	//This gets called either by #disableAPI above or #disableAPI in one of the requiring plugins
-	@Override
 	public void disable(Plugin plugin) {
 		if (!injected) {
 			return;//Not enabled

API/src/org/inventivetalent/packetlistener/PacketListenerPlugin.java

@@ -2,20 +2,18 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.inventivetalent.apihelper.APIManager;
 import org.inventivetalent.packetlistener.metrics.Metrics;
 import org.inventivetalent.update.spiget.SpigetUpdate;
 import org.inventivetalent.update.spiget.UpdateCallback;
 import org.inventivetalent.update.spiget.comparator.VersionComparator;
 
 public class PacketListenerPlugin extends JavaPlugin {
 
-	private PacketListenerAPI packetListenerAPI = new PacketListenerAPI();
+	private final PacketListenerAPI packetListenerAPI = new PacketListenerAPI();
 
 	@Override
 	public void onLoad() {
-		//Register this API if the plugin gets loaded
-		APIManager.registerAPI(packetListenerAPI, this);
+		packetListenerAPI.load();
 	}
 
 	@Override
@@ -46,14 +44,12 @@ public void upToDate() {
 
 		new Metrics(this, 225);
 
-		//Initialize this API if the plugin got enabled
-		APIManager.initAPI(PacketListenerAPI.class);
+		packetListenerAPI.init(this);
 	}
 
 	@Override
 	public void onDisable() {
-		//Disable this API if the plugin was enabled
-		APIManager.disableAPI(PacketListenerAPI.class);
+		packetListenerAPI.disable(this);
 	}
 
 }

Plugin/pom.xml

@@ -19,11 +19,6 @@
             <artifactId>api</artifactId>
             <version>${pl.version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.inventivetalent.packetlistener</groupId>-->
-            <!--<artifactId>comp-api</artifactId>-->
-            <!--<version>${pl.version}</version>-->
-        <!--</dependency>-->
     </dependencies>
 
 

Plugin/resources/plugin.yml

@@ -3,4 +3,4 @@ main: org.inventivetalent.packetlistener.PacketListenerPlugin
 author: inventivetalent
 version: ${project.version}
 
-loadbefore: [ProtocolSupport]
+loadbefore: [ProtocolSupport]

pom.xml

@@ -63,18 +63,13 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.mcstats.*</include>
                                     <include>org.inventivetalent.packetlistenerapi:**</include>
                                     <include>org.inventivetalent:reflectionhelper**</include>
                                     <include>org.inventivetalent:apimanager**</include>
                                     <include>org.inventivetalent.spiget-update:bukkit**</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
-                                <relocation>
-                                    <pattern>org.mcstats</pattern>
-                                    <shadedPattern>org.inventivetalent.packetlistener.mcstats</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.inventivetalent.reflection</pattern>
                                     <shadedPattern>org.inventivetalent.packetlistener.reflection</shadedPattern>