From f295b7b1ed56e66e8163ab71369c78b4a1d1ca26 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Wed, 3 May 2023 16:51:47 +0100 Subject: [PATCH] remove old packages --- plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java | 6 +++--- .../java/lol/pyr/znpcsplus/entity/PacketEntity.java | 4 ++-- .../pyr/znpcsplus}/reflection/ReflectionBuilder.java | 4 ++-- .../znpcsplus}/reflection/ReflectionLazyLoader.java | 4 ++-- .../pyr/znpcsplus}/reflection/ReflectionPackage.java | 4 ++-- .../pyr/znpcsplus}/reflection/Reflections.java | 10 +++++----- .../znpcsplus}/reflection/types/ClassReflection.java | 6 +++--- .../znpcsplus}/reflection/types/FieldReflection.java | 6 +++--- .../znpcsplus}/reflection/types/MethodReflection.java | 6 +++--- .../lol/pyr/znpcsplus/scheduling/FoliaScheduler.java | 2 +- .../java/lol/pyr/znpcsplus/skin/cache/SkinCache.java | 2 +- .../pyr/znpcsplus/util/BungeeUtil.java} | 6 +++--- .../util/{StringUtils.java => StringUtil.java} | 2 +- .../pyr/znpcsplus/util}/VersionUtil.java | 2 +- plugin/src/main/resources/plugin.yml | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/ReflectionBuilder.java (96%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/ReflectionLazyLoader.java (95%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/ReflectionPackage.java (92%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/Reflections.java (93%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/types/ClassReflection.java (60%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/types/FieldReflection.java (95%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers => lol/pyr/znpcsplus}/reflection/types/MethodReflection.java (92%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers/utility/BungeeUtils.java => lol/pyr/znpcsplus/util/BungeeUtil.java} (85%) rename plugin/src/main/java/lol/pyr/znpcsplus/util/{StringUtils.java => StringUtil.java} (86%) rename plugin/src/main/java/{io/github/znetworkw/znpcservers/utility => lol/pyr/znpcsplus/util}/VersionUtil.java (93%) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java index dd07259..58e55bc 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java @@ -4,7 +4,7 @@ import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListenerPriority; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder; -import io.github.znetworkw.znpcservers.utility.BungeeUtils; +import lol.pyr.znpcsplus.util.BungeeUtil; import lol.pyr.director.adventure.command.CommandManager; import lol.pyr.znpcsplus.api.ZApiProvider; import lol.pyr.znpcsplus.api.entity.EntityProperty; @@ -50,7 +50,7 @@ public class ZNPCsPlus extends JavaPlugin { public static File PATH_FOLDER; private static final int PLUGIN_ID = 18244; public static TaskScheduler SCHEDULER; - public static BungeeUtils BUNGEE_UTILS; + public static BungeeUtil BUNGEE_UTILS; public static BukkitAudiences ADVENTURE; public static boolean PLACEHOLDERS_SUPPORTED; @@ -120,7 +120,7 @@ public class ZNPCsPlus extends JavaPlugin { getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); new Metrics(this, PLUGIN_ID); SCHEDULER = FoliaUtil.isFolia() ? new FoliaScheduler(this) : new SpigotScheduler(this); - BUNGEE_UTILS = new BungeeUtils(this); + BUNGEE_UTILS = new BungeeUtil(this); Bukkit.getOnlinePlayers().forEach(User::get); log(ChatColor.WHITE + " * Starting tasks..."); 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 4e964dd..6501712 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java @@ -2,8 +2,8 @@ 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.VersionUtil; +import lol.pyr.znpcsplus.reflection.Reflections; +import lol.pyr.znpcsplus.util.VersionUtil; import lol.pyr.znpcsplus.api.entity.PropertyHolder; import lol.pyr.znpcsplus.packets.PacketFactory; import lol.pyr.znpcsplus.util.ZLocation; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionBuilder.java similarity index 96% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionBuilder.java index b541cba..3cda9e6 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionBuilder.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionBuilder.java @@ -1,7 +1,7 @@ -package io.github.znetworkw.znpcservers.reflection; +package lol.pyr.znpcsplus.reflection; import com.google.common.collect.ImmutableList; -import io.github.znetworkw.znpcservers.utility.VersionUtil; +import lol.pyr.znpcsplus.util.VersionUtil; import java.util.ArrayList; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionLazyLoader.java similarity index 95% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionLazyLoader.java index 316a1b9..ab9cc3b 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionLazyLoader.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionLazyLoader.java @@ -1,6 +1,6 @@ -package io.github.znetworkw.znpcservers.reflection; +package lol.pyr.znpcsplus.reflection; -import io.github.znetworkw.znpcservers.utility.VersionUtil; +import lol.pyr.znpcsplus.util.VersionUtil; import lol.pyr.znpcsplus.ZNPCsPlus; import java.util.ArrayList; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java similarity index 92% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java index b0e0a29..ab0f30f 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/ReflectionPackage.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java @@ -1,6 +1,6 @@ -package io.github.znetworkw.znpcservers.reflection; +package lol.pyr.znpcsplus.reflection; -import io.github.znetworkw.znpcservers.utility.VersionUtil; +import lol.pyr.znpcsplus.util.VersionUtil; import java.util.Arrays; import java.util.Objects; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/Reflections.java similarity index 93% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/Reflections.java index b178484..8977ee8 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/Reflections.java @@ -1,10 +1,10 @@ -package io.github.znetworkw.znpcservers.reflection; +package lol.pyr.znpcsplus.reflection; 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.VersionUtil; +import lol.pyr.znpcsplus.reflection.types.ClassReflection; +import lol.pyr.znpcsplus.reflection.types.FieldReflection; +import lol.pyr.znpcsplus.reflection.types.MethodReflection; +import lol.pyr.znpcsplus.util.VersionUtil; import lol.pyr.znpcsplus.util.FoliaUtil; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/ClassReflection.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/ClassReflection.java similarity index 60% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/ClassReflection.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/ClassReflection.java index 29dfe41..de3f106 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/ClassReflection.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/ClassReflection.java @@ -1,7 +1,7 @@ -package io.github.znetworkw.znpcservers.reflection.types; +package lol.pyr.znpcsplus.reflection.types; -import io.github.znetworkw.znpcservers.reflection.ReflectionBuilder; -import io.github.znetworkw.znpcservers.reflection.ReflectionLazyLoader; +import lol.pyr.znpcsplus.reflection.ReflectionBuilder; +import lol.pyr.znpcsplus.reflection.ReflectionLazyLoader; public class ClassReflection extends ReflectionLazyLoader> { public ClassReflection(ReflectionBuilder reflectionBuilder) { diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/FieldReflection.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/FieldReflection.java similarity index 95% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/FieldReflection.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/FieldReflection.java index 029e5b5..dab66f9 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/FieldReflection.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/FieldReflection.java @@ -1,7 +1,7 @@ -package io.github.znetworkw.znpcservers.reflection.types; +package lol.pyr.znpcsplus.reflection.types; -import io.github.znetworkw.znpcservers.reflection.ReflectionLazyLoader; -import io.github.znetworkw.znpcservers.reflection.ReflectionBuilder; +import lol.pyr.znpcsplus.reflection.ReflectionLazyLoader; +import lol.pyr.znpcsplus.reflection.ReflectionBuilder; import java.lang.reflect.Field; import java.util.List; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/MethodReflection.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/MethodReflection.java similarity index 92% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/MethodReflection.java rename to plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/MethodReflection.java index cb912e1..c758727 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/reflection/types/MethodReflection.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/types/MethodReflection.java @@ -1,8 +1,8 @@ -package io.github.znetworkw.znpcservers.reflection.types; +package lol.pyr.znpcsplus.reflection.types; import com.google.common.collect.ImmutableList; -import io.github.znetworkw.znpcservers.reflection.ReflectionBuilder; -import io.github.znetworkw.znpcservers.reflection.ReflectionLazyLoader; +import lol.pyr.znpcsplus.reflection.ReflectionBuilder; +import lol.pyr.znpcsplus.reflection.ReflectionLazyLoader; import java.lang.reflect.Method; import java.util.*; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/scheduling/FoliaScheduler.java b/plugin/src/main/java/lol/pyr/znpcsplus/scheduling/FoliaScheduler.java index 94f457d..342b4ff 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/scheduling/FoliaScheduler.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/scheduling/FoliaScheduler.java @@ -1,6 +1,6 @@ package lol.pyr.znpcsplus.scheduling; -import io.github.znetworkw.znpcservers.reflection.Reflections; +import lol.pyr.znpcsplus.reflection.Reflections; import org.bukkit.plugin.Plugin; import java.lang.reflect.InvocationTargetException; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/skin/cache/SkinCache.java b/plugin/src/main/java/lol/pyr/znpcsplus/skin/cache/SkinCache.java index a04bc39..0c79817 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/skin/cache/SkinCache.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/skin/cache/SkinCache.java @@ -3,7 +3,7 @@ package lol.pyr.znpcsplus.skin.cache; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.authlib.GameProfile; -import io.github.znetworkw.znpcservers.reflection.Reflections; +import lol.pyr.znpcsplus.reflection.Reflections; import lol.pyr.znpcsplus.skin.Skin; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/BungeeUtils.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/BungeeUtil.java similarity index 85% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/utility/BungeeUtils.java rename to plugin/src/main/java/lol/pyr/znpcsplus/util/BungeeUtil.java index b62bd83..e9fc00d 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/BungeeUtils.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/BungeeUtil.java @@ -1,4 +1,4 @@ -package io.github.znetworkw.znpcservers.utility; +package lol.pyr.znpcsplus.util; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -7,10 +7,10 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -public class BungeeUtils { +public class BungeeUtil { private final Plugin plugin; - public BungeeUtils(Plugin plugin) { + public BungeeUtil(Plugin plugin) { this.plugin = plugin; } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtils.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtil.java similarity index 86% rename from plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtils.java rename to plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtil.java index 22b211e..cc06b21 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtils.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/StringUtil.java @@ -1,6 +1,6 @@ package lol.pyr.znpcsplus.util; -public class StringUtils { +public class StringUtil { public static boolean startsWithIgnoreCase(String s1, String s2) { return s1.toLowerCase().startsWith(s2.toLowerCase()); } diff --git a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/VersionUtil.java similarity index 93% rename from plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java rename to plugin/src/main/java/lol/pyr/znpcsplus/util/VersionUtil.java index 0a14e75..b36b790 100644 --- a/plugin/src/main/java/io/github/znetworkw/znpcservers/utility/VersionUtil.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/VersionUtil.java @@ -1,4 +1,4 @@ -package io.github.znetworkw.znpcservers.utility; +package lol.pyr.znpcsplus.util; import org.bukkit.Bukkit; diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml index c1c78f5..bda48a8 100644 --- a/plugin/src/main/resources/plugin.yml +++ b/plugin/src/main/resources/plugin.yml @@ -12,5 +12,5 @@ softdepend: - ViaBackwards - ViaRewind - Geyser-Spigot -authors: [gonalez (g0b#3830), Pyr (Pyr#6969)] +authors: [Pyr (Pyr#6969)] folia-supported: true \ No newline at end of file