Skip to content

Commit 07b3ef7

Browse files
committed
chore(deps): remove paperlib
1 parent 24cb404 commit 07b3ef7

5 files changed

Lines changed: 20 additions & 14 deletions

File tree

Insights-API/src/main/java/dev/frankheijden/insights/api/utils/VersionUtils.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
public class VersionUtils {
66

7-
private static final Pattern integerPattern = Pattern.compile("[^0-9]");
7+
public static final boolean IS_PAPER = classExists("io.papermc.paper.threadedregions.scheduler.ScheduledTask");
8+
private static final Pattern INTEGER_PATTERN = Pattern.compile("[^0-9]");
89

910
private VersionUtils() {}
1011

@@ -34,6 +35,15 @@ public static boolean isNewVersion(String oldVersion, String newVersion) {
3435
}
3536

3637
private static int extractInteger(String str) {
37-
return Integer.parseInt(integerPattern.matcher(str).replaceAll(""));
38+
return Integer.parseInt(INTEGER_PATTERN.matcher(str).replaceAll(""));
39+
}
40+
41+
private static boolean classExists(String className) {
42+
try {
43+
Class.forName(className);
44+
return true;
45+
} catch (ClassNotFoundException e) {
46+
return false;
47+
}
3848
}
3949
}

Insights-Core/src/main/java/dev/frankheijden/insights/Insights.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import dev.frankheijden.insights.api.objects.wrappers.ScanObject;
2424
import dev.frankheijden.insights.api.tasks.UpdateCheckerTask;
2525
import dev.frankheijden.insights.api.utils.IOUtils;
26+
import dev.frankheijden.insights.api.utils.VersionUtils;
2627
import dev.frankheijden.insights.commands.CommandCancelScan;
2728
import dev.frankheijden.insights.commands.CommandInsights;
2829
import dev.frankheijden.insights.commands.CommandScan;
@@ -42,7 +43,6 @@
4243
import dev.frankheijden.insights.placeholders.InsightsPlaceholderExpansion;
4344
import dev.frankheijden.insights.tasks.PlayerTrackerTask;
4445
import io.leangen.geantyref.TypeToken;
45-
import io.papermc.lib.PaperLib;
4646
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
4747
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
4848
import org.bukkit.Bukkit;
@@ -149,7 +149,7 @@ public void onEnable() {
149149

150150
private static boolean isIncompatible() {
151151
var minecraftVersion = Version.parse(Bukkit.getServer().getMinecraftVersion(), false);
152-
return !PaperLib.isPaper() || minecraftVersion.compareTo(minimumCompatibleVersion) < 0;
152+
return !VersionUtils.IS_PAPER || minecraftVersion.compareTo(minimumCompatibleVersion) < 0;
153153
}
154154

155155
@Override

Insights-Core/src/main/java/dev/frankheijden/insights/listeners/manager/ListenerManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import dev.frankheijden.insights.api.annotations.AllowPriorityOverride;
66
import dev.frankheijden.insights.api.listeners.InsightsListener;
77
import dev.frankheijden.insights.api.listeners.manager.InsightsListenerManager;
8+
import dev.frankheijden.insights.api.utils.VersionUtils;
89
import dev.frankheijden.insights.listeners.BlockListener;
910
import dev.frankheijden.insights.listeners.ChunkListener;
1011
import dev.frankheijden.insights.listeners.EntityListener;
@@ -14,7 +15,6 @@
1415
import dev.frankheijden.insights.listeners.PlayerListener;
1516
import dev.frankheijden.insights.listeners.WorldListener;
1617
import dev.frankheijden.insights.nms.core.ReflectionUtils;
17-
import io.papermc.lib.PaperLib;
1818
import java.lang.reflect.InvocationTargetException;
1919
import java.lang.reflect.Method;
2020
import java.util.ArrayList;
@@ -40,7 +40,7 @@ public class ListenerManager implements InsightsListenerManager {
4040
List<Method> disableMethods = new ArrayList<>();
4141
disableMethods.addAll(ReflectionUtils.getAnnotatedMethods(BlockListener.class, AllowDisabling.class));
4242
disableMethods.addAll(ReflectionUtils.getAnnotatedMethods(WorldListener.class, AllowDisabling.class));
43-
if (PaperLib.isPaper()) {
43+
if (VersionUtils.IS_PAPER) {
4444
disableMethods.addAll(ReflectionUtils.getAnnotatedMethods(PaperBlockListener.class, AllowDisabling.class));
4545
}
4646
ALLOWED_DISABLE_EVENTS = getEventClassMap(disableMethods);
@@ -84,9 +84,9 @@ public ListenerManager(Insights plugin) {
8484
this.chunkListener = new ChunkListener(plugin);
8585
this.blockListener = new BlockListener(plugin);
8686
this.worldListener = new WorldListener(plugin);
87-
this.paperEntityListener = PaperLib.isPaper() ? new PaperEntityListener(plugin) : null;
88-
this.paperBlockListener = PaperLib.isPaper() ? new PaperBlockListener(plugin) : null;
89-
this.entityListener = PaperLib.isPaper() ? null : new EntityListener(plugin);
87+
this.paperEntityListener = VersionUtils.IS_PAPER ? new PaperEntityListener(plugin) : null;
88+
this.paperBlockListener = VersionUtils.IS_PAPER ? new PaperBlockListener(plugin) : null;
89+
this.entityListener = VersionUtils.IS_PAPER ? null : new EntityListener(plugin);
9090
this.pistonListener = new PistonListener(plugin);
9191
}
9292

@@ -104,7 +104,7 @@ public void register() {
104104
BlockRedstoneEvent.getHandlerList().unregister(blockListener);
105105
}
106106

107-
if (PaperLib.isPaper()) {
107+
if (VersionUtils.IS_PAPER) {
108108
listeners.add(paperEntityListener);
109109
disableListeners.add(paperBlockListener);
110110
} else {

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ subprojects {
5656
val libs = rootProject.libs
5757
dependencies {
5858
compileOnly(libs.paperApi)
59-
implementation(libs.paperLib)
6059
implementation(libs.bStatsBukkit)
6160
implementation(libs.adventureApi)
6261
implementation(libs.adventureMiniMessage)
@@ -109,7 +108,6 @@ subprojects {
109108

110109
tasks.withType<ShadowJar> {
111110
relocate("dev.frankheijden.minecraftreflection", "$dependencyDir.minecraftreflection")
112-
relocate("io.papermc.lib", "$dependencyDir.paperlib")
113111
relocate("org.bstats", "$dependencyDir.bstats")
114112
relocate("net.kyori.adventure", "$dependencyDir.adventure")
115113
relocate("net.kyori.examination", "$dependencyDir.examination")

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# libraries
33
semver = "0.10.2"
44
minecraft = "26.1.2.build.+"
5-
paperLib = "1.0.8"
65
bStats = "3.0.0"
76
adventure = "4.17.0"
87
adventurePlatformBukkit = "4.4.1"
@@ -26,7 +25,6 @@ pluginYml = "0.6.0"
2625
[libraries]
2726
semver = { group = "com.github.zafarkhaja", name = "java-semver", version.ref = "semver" }
2827
paperApi = { group = "io.papermc.paper", name = "paper-api", version.ref = "minecraft" }
29-
paperLib = { group = "io.papermc", name = "paperlib", version.ref = "paperLib" }
3028
bStatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bStats" }
3129
adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
3230
adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }

0 commit comments

Comments
 (0)