From 2b086a1f8c6abea7baabe9b207195b32d6927300 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Sun, 10 Sep 2023 11:21:54 +0100
Subject: [PATCH] Remove PF4J

It was only used for OpenOSRS compatibility, so it's now redundant.

Signed-off-by: Graham <gpe@openrs2.org>
---
 gradle/libs.versions.toml                                | 1 -
 xtea-plugin/build.gradle.kts                             | 3 ---
 .../src/main/java/org/openrs2/xtea/XteaPlugin.java       | 5 +----
 xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java   | 9 ---------
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e4fb7ab..ca81ff98 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -74,7 +74,6 @@ netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty"
 netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
 netty-transport = { module = "io.netty:netty-transport", version.ref = "netty" }
 openrs2-natives = { module = "org.openrs2:openrs2-natives-all", version = "3.2.0" }
-pf4j = { module = "org.pf4j:pf4j", version = "3.9.0" }
 postgres = { module = "org.postgresql:postgresql", version = "42.6.0" }
 result-core = { module = "com.michael-bull.kotlin-result:kotlin-result", version = "1.1.18" }
 result-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version = "1.1.18" }
diff --git a/xtea-plugin/build.gradle.kts b/xtea-plugin/build.gradle.kts
index 190ed6f3..bfb4cba9 100644
--- a/xtea-plugin/build.gradle.kts
+++ b/xtea-plugin/build.gradle.kts
@@ -4,9 +4,6 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor(libs.pf4j)
-
-    compileOnly(libs.pf4j)
     compileOnly(libs.runelite.client)
 
     testImplementation(libs.runelite.client)
diff --git a/xtea-plugin/src/main/java/org/openrs2/xtea/XteaPlugin.java b/xtea-plugin/src/main/java/org/openrs2/xtea/XteaPlugin.java
index 0759af2f..feae14e5 100644
--- a/xtea-plugin/src/main/java/org/openrs2/xtea/XteaPlugin.java
+++ b/xtea-plugin/src/main/java/org/openrs2/xtea/XteaPlugin.java
@@ -19,17 +19,14 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.internal.annotations.EverythingIsNonNull;
-import org.pf4j.Extension;
-import org.pf4j.ExtensionPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Extension
 @PluginDescriptor(
 	name = "OpenRS2 XTEA",
 	description = "Collects XTEA keys and submits them to the OpenRS2 Archive"
 )
-public final class XteaPlugin extends Plugin implements ExtensionPoint {
+public final class XteaPlugin extends Plugin {
 	private static final Logger log = LoggerFactory.getLogger(XteaPlugin.class);
 
 	@Inject
diff --git a/xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java b/xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java
deleted file mode 100644
index 37993ddd..00000000
--- a/xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.pf4j;
-
-/**
- * Stub implementation of {@code org.pf4j.ExtensionPoint} so the plugin works
- * in and builds against RuneLite, which doesn't have P4J on its classpath.
- */
-public interface ExtensionPoint {
-	// empty
-}