From f993a521ede4c3da1253dddaf482525f2a0ed603 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Wed, 3 May 2023 16:49:44 +0100 Subject: [PATCH] minor refactoring --- .../znpcservers/reflection/ReflectionBuilder.java | 4 ++-- .../znpcservers/reflection/ReflectionLazyLoader.java | 4 ++-- .../znpcservers/reflection/ReflectionPackage.java | 8 ++++---- .../znetworkw/znpcservers/reflection/Reflections.java | 6 +++--- .../znpcservers/utility/{Utils.java => VersionUtil.java} | 9 ++------- .../main/java/lol/pyr/znpcsplus/entity/PacketEntity.java | 4 ++-- 6 files changed, 15 insertions(+), 20 deletions(-) rename plugin/src/main/java/io/github/znetworkw/znpcservers/utility/{Utils.java => VersionUtil.java} (75%) diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java index b39ce6a..b541cba 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java +++ b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java @@ -1,7 +1,7 @@ package io.github.znetworkw.znpcservers.reflection; import com.google.common.collect.ImmutableList; -import io.github.znetworkw.znpcservers.utility.Utils; +import io.github.znetworkw.znpcservers.utility.VersionUtil; import java.util.ArrayList; @@ -32,7 +32,7 @@ public class ReflectionBuilder { } public ReflectionBuilder withClassName(String className) { - this.className.add(ReflectionPackage.join(reflectionPackage, Utils.versionNewer(17) ? additionalData : "", className)); + this.className.add(ReflectionPackage.join(reflectionPackage, VersionUtil.isNewerThan(17) ? additionalData : "", className)); return this; } diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java index 4ef12a8..316a1b9 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java +++ b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java @@ -1,6 +1,6 @@ package io.github.znetworkw.znpcservers.reflection; -import io.github.znetworkw.znpcservers.utility.Utils; +import io.github.znetworkw.znpcservers.utility.VersionUtil; import lol.pyr.znpcsplus.ZNPCsPlus; import java.util.ArrayList; @@ -38,7 +38,7 @@ public abstract class ReflectionLazyLoader { warn(getClass().getSimpleName() + " failed!"); warn("Class Names: " + possibleClassNames); warn("Reflection Type: " + getClass().getCanonicalName()); - warn("Bukkit Version: " + Utils.BUKKIT_VERSION + " (" + Utils.getBukkitPackage() + ")"); + warn("Bukkit Version: " + VersionUtil.BUKKIT_VERSION + " (" + VersionUtil.getBukkitPackage() + ")"); printDebugInfo(this::warn); warn("Exception:"); throwable.printStackTrace(); diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java index 08f88db..b0e0a29 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java +++ b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java @@ -1,6 +1,6 @@ package io.github.znetworkw.znpcservers.reflection; -import io.github.znetworkw.znpcservers.utility.Utils; +import io.github.znetworkw.znpcservers.utility.VersionUtil; import java.util.Arrays; import java.util.Objects; @@ -12,15 +12,15 @@ import java.util.stream.Collectors; * pre-1.17 had all of their classes "flattened" into one package. */ public class ReflectionPackage { - private static final boolean flattened = !Utils.versionNewer(17); + private static final boolean flattened = !VersionUtil.isNewerThan(17); - public static final String BUKKIT = "org.bukkit.craftbukkit." + Utils.getBukkitPackage(); + public static final String BUKKIT = "org.bukkit.craftbukkit." + VersionUtil.getBukkitPackage(); /** * Check if the classes are flattened, if so we need to add the version string into the * package string which is another quirk of the old server jars. */ - public static final String MINECRAFT = join("net.minecraft", flattened ? "server." + Utils.getBukkitPackage() : ""); + public static final String MINECRAFT = join("net.minecraft", flattened ? "server." + VersionUtil.getBukkitPackage() : ""); public static final String ENTITY = flattened ? MINECRAFT : join(MINECRAFT, "world.entity"); // Simple method that joins all the non-null & non-empty arguments with a dot and returns the result diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java index 47259db..b178484 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java +++ b/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java @@ -4,7 +4,7 @@ import com.mojang.authlib.GameProfile; import io.github.znetworkw.znpcservers.reflection.types.ClassReflection; import io.github.znetworkw.znpcservers.reflection.types.FieldReflection; import io.github.znetworkw.znpcservers.reflection.types.MethodReflection; -import io.github.znetworkw.znpcservers.utility.Utils; +import io.github.znetworkw.znpcservers.utility.VersionUtil; import lol.pyr.znpcsplus.util.FoliaUtil; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; @@ -42,7 +42,7 @@ public final class Reflections { new ReflectionBuilder(ReflectionPackage.ENTITY) .withClassName(ENTITY_CLASS) .withFieldName("entityCount") - .setStrict(!Utils.versionNewer(14))).staticValueModifier(int.class); + .setStrict(!VersionUtil.isNewerThan(14))).staticValueModifier(int.class); public static final ReflectionLazyLoader ATOMIC_ENTITY_ID_FIELD = new FieldReflection( new ReflectionBuilder(ReflectionPackage.ENTITY) @@ -51,7 +51,7 @@ public final class Reflections { .withFieldName("d") .withFieldName("c") .withExpectResult(AtomicInteger.class) - .setStrict(Utils.versionNewer(14))).staticValueLoader(AtomicInteger.class); + .setStrict(VersionUtil.isNewerThan(14))).staticValueLoader(AtomicInteger.class); public static final Class ASYNC_SCHEDULER_CLASS = new ClassReflection( new ReflectionBuilder("io.papermc.paper.threadedregions.scheduler") diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/Utils.java b/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java similarity index 75% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/utility/Utils.java rename to plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java index cc0fa04..0a14e75 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/Utils.java +++ b/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java @@ -1,9 +1,8 @@ package io.github.znetworkw.znpcservers.utility; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -public final class Utils { +public final class VersionUtil { public static final int BUKKIT_VERSION; static { @@ -14,7 +13,7 @@ public final class Utils { BUKKIT_VERSION = version; } - public static boolean versionNewer(int version) { + public static boolean isNewerThan(int version) { return (BUKKIT_VERSION >= version); } @@ -26,8 +25,4 @@ public final class Utils { String version = getBukkitPackage().replace("v", "").replace("R", ""); return version.substring(2, version.length() - 2); } - - public static String toColor(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java index e5210c9..4e964dd 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java @@ -3,7 +3,7 @@ package lol.pyr.znpcsplus.entity; import com.github.retrooper.packetevents.protocol.entity.type.EntityType; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import io.github.znetworkw.znpcservers.reflection.Reflections; -import io.github.znetworkw.znpcservers.utility.Utils; +import io.github.znetworkw.znpcservers.utility.VersionUtil; import lol.pyr.znpcsplus.api.entity.PropertyHolder; import lol.pyr.znpcsplus.packets.PacketFactory; import lol.pyr.znpcsplus.util.ZLocation; @@ -63,7 +63,7 @@ public class PacketEntity { } private static int reserveEntityID() { - if (Utils.versionNewer(14)) return Reflections.ATOMIC_ENTITY_ID_FIELD.get().incrementAndGet(); + if (VersionUtil.isNewerThan(14)) return Reflections.ATOMIC_ENTITY_ID_FIELD.get().incrementAndGet(); else { int id = Reflections.ENTITY_ID_MODIFIER.get(); Reflections.ENTITY_ID_MODIFIER.set(id + 1);