From fab8274177601ad24bc8614926685a867272e4c3 Mon Sep 17 00:00:00 2001 From: trimill Date: Sun, 29 Aug 2021 02:32:25 -0400 Subject: [PATCH 1/2] Updated to 1.17.1 --- build.gradle | 8 +++++--- src/main/java/io/egg/tickspeed/TickTimeJob.java | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index d3f6a69..8a30b77 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,13 @@ repositories { } } -dependencies { - compile 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT' +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 +dependencies { + compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT' } test { useJUnitPlatform() -} \ No newline at end of file +} diff --git a/src/main/java/io/egg/tickspeed/TickTimeJob.java b/src/main/java/io/egg/tickspeed/TickTimeJob.java index 06b0d27..7134cad 100644 --- a/src/main/java/io/egg/tickspeed/TickTimeJob.java +++ b/src/main/java/io/egg/tickspeed/TickTimeJob.java @@ -1,6 +1,5 @@ package io.egg.tickspeed; - import org.bukkit.Bukkit; import java.lang.reflect.Field; @@ -18,9 +17,9 @@ public TickTimeJob() { try { utils = getNmsClass("SystemUtils"); getMillis = utils.getDeclaredMethod("getMonotonicMillis"); - server = getNmsClass("MinecraftServer"); + server = getNmsClass("server.MinecraftServer"); getServer = server.getMethod("getServer"); - f = server.getDeclaredField("nextTick"); + f = server.getDeclaredField("ao"); } catch (ClassNotFoundException | NoSuchMethodException | NoSuchFieldException e) { e.printStackTrace(); } @@ -58,7 +57,7 @@ public Class getNmsClass(String name) throws ClassNotFoundException { String packageVersion = array.length == 4 ? array[3] + "." : ""; // construct the qualified class name from the obtained package version - String qualName = "net.minecraft.server." + packageVersion + name; + String qualName = "net.minecraft." + name; // simple call to get the Class object return Class.forName(qualName); From bf2d8ecc1e3f81fae4516099bf86877517f41b20 Mon Sep 17 00:00:00 2001 From: trimill Date: Sun, 29 Aug 2021 02:35:33 -0400 Subject: [PATCH 2/2] Removed unneccesary code --- src/main/java/io/egg/tickspeed/TickTimeJob.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/io/egg/tickspeed/TickTimeJob.java b/src/main/java/io/egg/tickspeed/TickTimeJob.java index 7134cad..b971ec4 100644 --- a/src/main/java/io/egg/tickspeed/TickTimeJob.java +++ b/src/main/java/io/egg/tickspeed/TickTimeJob.java @@ -50,12 +50,6 @@ public void run() { } } public Class getNmsClass(String name) throws ClassNotFoundException { - // explode the Server interface implementation's package name into its components - String[] array = Bukkit.getServer().getClass().getPackage().getName().split("\\."); - - // pick out the component representing the package version if it's present - String packageVersion = array.length == 4 ? array[3] + "." : ""; - // construct the qualified class name from the obtained package version String qualName = "net.minecraft." + name;