Remove PF4J

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

Signed-off-by: Graham <gpe@openrs2.org>
Graham 1 year ago
parent 5e5632637f
commit 2b086a1f8c
  1. 1
      gradle/libs.versions.toml
  2. 3
      xtea-plugin/build.gradle.kts
  3. 5
      xtea-plugin/src/main/java/org/openrs2/xtea/XteaPlugin.java
  4. 9
      xtea-plugin/src/main/java/org/pf4j/ExtensionPoint.java

@ -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-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
netty-transport = { module = "io.netty:netty-transport", 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" } 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" } postgres = { module = "org.postgresql:postgresql", version = "42.6.0" }
result-core = { module = "com.michael-bull.kotlin-result:kotlin-result", version = "1.1.18" } 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" } result-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version = "1.1.18" }

@ -4,9 +4,6 @@ plugins {
} }
dependencies { dependencies {
annotationProcessor(libs.pf4j)
compileOnly(libs.pf4j)
compileOnly(libs.runelite.client) compileOnly(libs.runelite.client)
testImplementation(libs.runelite.client) testImplementation(libs.runelite.client)

@ -19,17 +19,14 @@ import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.internal.annotations.EverythingIsNonNull; import okhttp3.internal.annotations.EverythingIsNonNull;
import org.pf4j.Extension;
import org.pf4j.ExtensionPoint;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Extension
@PluginDescriptor( @PluginDescriptor(
name = "OpenRS2 XTEA", name = "OpenRS2 XTEA",
description = "Collects XTEA keys and submits them to the OpenRS2 Archive" 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); private static final Logger log = LoggerFactory.getLogger(XteaPlugin.class);
@Inject @Inject

@ -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
}
Loading…
Cancel
Save