Skip to content

Change JavaPlugin to Plugin #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TechnicallyCoded merged 2 commits into from
Oct 15, 2024
Merged

Change JavaPlugin to Plugin #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c257982
JavaPlugin -> Plugin
failutee Aug 31, 2024
9b88d15
Remove unused import
failutee Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions common/src/main/java/com/tcoded/folialib/FoliaLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
import com.tcoded.folialib.enums.ImplementationType;
import com.tcoded.folialib.impl.PlatformScheduler;
import com.tcoded.folialib.util.InvalidTickDelayNotifier;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.plugin.Plugin;

import java.lang.reflect.InvocationTargetException;
import java.util.logging.Logger;

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
Expand Down Expand Up @@ -95,7 +95,7 @@ public boolean isUnsupported() {
return implementationType == ImplementationType.UNKNOWN;
}

public JavaPlugin getPlugin() {
public Plugin getPlugin() {
return plugin;
}

Expand Down
4 changes: 2 additions & 2 deletions platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...form/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions platform/unsupported/src/main/java/com/tcoded/folialib/impl/UnsupportedImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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(
Expand Down