From c257982a01d6e84dadbbc046b7aa9506cddc9e05 Mon Sep 17 00:00:00 2001 From: failutee <50597234+failutee@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:51:50 +0200 Subject: [PATCH 1/2] JavaPlugin -> Plugin --- common/src/main/java/com/tcoded/folialib/FoliaLib.java | 7 ++++--- .../java/com/tcoded/folialib/impl/FoliaImplementation.java | 4 ++-- .../tcoded/folialib/impl/LegacySpigotImplementation.java | 4 ++-- .../com/tcoded/folialib/impl/SpigotImplementation.java | 4 ++-- .../tcoded/folialib/impl/UnsupportedImplementation.java | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/com/tcoded/folialib/FoliaLib.java b/common/src/main/java/com/tcoded/folialib/FoliaLib.java index 62fb40f..d52d0f4 100644 --- a/common/src/main/java/com/tcoded/folialib/FoliaLib.java +++ b/common/src/main/java/com/tcoded/folialib/FoliaLib.java @@ -3,6 +3,7 @@ import com.tcoded.folialib.enums.ImplementationType; import com.tcoded.folialib.impl.PlatformScheduler; import com.tcoded.folialib.util.InvalidTickDelayNotifier; +import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import java.lang.reflect.InvocationTargetException; @@ -10,12 +11,12 @@ public class FoliaLib { - private final JavaPlugin plugin; + private final Plugin plugin; private final ImplementationType implementationType; private final PlatformScheduler scheduler; - public FoliaLib(JavaPlugin plugin) { + public FoliaLib(Plugin plugin) { this.plugin = plugin; // Find the implementation type based on the class names @@ -95,7 +96,7 @@ public boolean isUnsupported() { return implementationType == ImplementationType.UNKNOWN; } - public JavaPlugin getPlugin() { + public Plugin getPlugin() { return plugin; } diff --git a/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java b/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java index accc27e..1308cf6 100644 --- a/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java +++ b/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Field; @@ -33,7 +33,7 @@ @SuppressWarnings("unused") public class FoliaImplementation implements PlatformScheduler { - private final JavaPlugin plugin; + private final Plugin plugin; private final GlobalRegionScheduler globalRegionScheduler; private final AsyncScheduler asyncScheduler; diff --git a/platform/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java b/platform/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java index ee4529a..507a071 100644 --- a/platform/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java +++ b/platform/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java @@ -14,7 +14,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; @@ -32,7 +32,7 @@ @SuppressWarnings("unused") public class LegacySpigotImplementation implements PlatformScheduler { - private final JavaPlugin plugin; + private final Plugin plugin; private final @NotNull BukkitScheduler scheduler; public LegacySpigotImplementation(FoliaLib foliaLib) { diff --git a/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java b/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java index 0c8fd54..1d53312 100644 --- a/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java +++ b/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; @@ -30,7 +30,7 @@ @SuppressWarnings("unused") public class SpigotImplementation implements PlatformScheduler { - private final JavaPlugin plugin; + private final Plugin plugin; private final @NotNull BukkitScheduler scheduler; public SpigotImplementation(FoliaLib foliaLib) { diff --git a/platform/unsupported/src/main/java/com/tcoded/folialib/impl/UnsupportedImplementation.java b/platform/unsupported/src/main/java/com/tcoded/folialib/impl/UnsupportedImplementation.java index 904db70..603b664 100644 --- a/platform/unsupported/src/main/java/com/tcoded/folialib/impl/UnsupportedImplementation.java +++ b/platform/unsupported/src/main/java/com/tcoded/folialib/impl/UnsupportedImplementation.java @@ -1,7 +1,7 @@ package com.tcoded.folialib.impl; import com.tcoded.folialib.FoliaLib; -import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.Plugin; import java.util.logging.Logger; @@ -11,7 +11,7 @@ public class UnsupportedImplementation extends LegacySpigotImplementation { public UnsupportedImplementation(FoliaLib foliaLib) { super(foliaLib); - JavaPlugin plugin = foliaLib.getPlugin(); + Plugin plugin = foliaLib.getPlugin(); Logger logger = plugin.getLogger(); logger.warning( From 9b88d15ff0c285df9f36d6ec9237f78421249a67 Mon Sep 17 00:00:00 2001 From: failutee <50597234+failutee@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:53:01 +0200 Subject: [PATCH 2/2] Remove unused import --- common/src/main/java/com/tcoded/folialib/FoliaLib.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/com/tcoded/folialib/FoliaLib.java b/common/src/main/java/com/tcoded/folialib/FoliaLib.java index d52d0f4..982a394 100644 --- a/common/src/main/java/com/tcoded/folialib/FoliaLib.java +++ b/common/src/main/java/com/tcoded/folialib/FoliaLib.java @@ -4,7 +4,6 @@ import com.tcoded.folialib.impl.PlatformScheduler; import com.tcoded.folialib.util.InvalidTickDelayNotifier; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; import java.lang.reflect.InvocationTargetException; import java.util.logging.Logger;