Skip to content

Commit ae545c0

Browse files
committedFeb 22, 2025
feat: Drop support for Bukkit
1 parent 1678316 commit ae545c0

File tree

12 files changed

+8
-25
lines changed

12 files changed

+8
-25
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ An API created to make Minecraft Plugin development easier
1414

1515
# Info
1616

17-
This API is aimed to simplify the development of Bukkit plugins (please use Paper or any fork of Paper instead of CraftBukkit/Spigot),
17+
This API is aimed to simplify the development of Paper plugins,
1818
providing a lot of utilities that will make your life (and mine) easier.
1919

2020
### It's used in my plugins, but you can use it on your own plugins if you want, just make sure to give proper credit!

‎build.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ dependencies {
117117
// Ansi
118118
compileOnly(libs.jansi)
119119

120-
// Adventure API
121-
compileOnly(libs.adventure.platform.bukkit)
122-
bukkitLibrary(libs.adventure.platform.bukkit)
123-
124120
// Libby
125121
implementation(libs.libby)
126122

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version=2.3.0-BETA
2-
description=An API aimed to simplify the development of Bukkit (better use Paper) plugins
2+
description=An API aimed to simplify the development of Paper plugins
33
author=Adrigamer2950

‎gradle/libs.versions.toml

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ jetbrains-annotations = "26.0.2"
66
plugin-yml = "0.6.0"
77
minotaur = "2.+"
88
run-server = "2.3.1"
9-
adventure-platform-bukkit = "4.3.4"
109
libby = "1.3.1"
1110
shadow = "8.1.1"
1211
paper-api = "1.18.2-R0.1-SNAPSHOT"
@@ -17,7 +16,6 @@ folia-api = { group = "dev.folia", name = "folia-api", version.ref = "folia-api"
1716
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
1817
jansi = { group = "org.fusesource.jansi", name = "jansi", version.ref = "jansi" }
1918
jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
20-
adventure-platform-bukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
2119
libby = { group = "net.byteflux", name = "libby-bukkit", version.ref = "libby" }
2220

2321
[plugins]

‎src/main/java/me/adrigamer2950/adriapi/AdriAPICommand.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public AdriAPICommand(AdriAPI plugin) {
1818

1919
@Override
2020
public boolean execute(User user, String label, String[] args) {
21-
//noinspection deprecation
2221
user.sendMessage(
2322
Component.text("AdriAPI Version ", NamedTextColor.GRAY)
2423
.append(Component.text(getPlugin().getDescription().getVersion(), NamedTextColor.GOLD))

‎src/main/java/me/adrigamer2950/adriapi/api/APIPlugin.java

-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import me.adrigamer2950.adriapi.api.logger.APILogger;
1010
import me.adrigamer2950.adriapi.api.util.ServerType;
1111
import me.adrigamer2950.adriapi.api.util.bStats;
12-
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
1312
import org.bukkit.event.Listener;
1413
import org.bukkit.plugin.java.JavaPlugin;
1514
import org.jetbrains.annotations.ApiStatus;
@@ -35,13 +34,11 @@ public abstract class APIPlugin extends JavaPlugin {
3534
private Scheduler scheduler;
3635
private bStats bstats;
3736
private ServerType serverType;
38-
private BukkitAudiences adventure;
3937
protected LibraryManager libraryManager;
4038

4139
@Override
4240
public final void onEnable() {
4341
this.serverType = ServerType.getType();
44-
this.adventure = BukkitAudiences.create(this);
4542
this.libraryManager = LibraryManager.get(this);
4643

4744
onPreLoad();
@@ -91,7 +88,6 @@ public final void onDisable() {
9188
if (this.bstats != null) this.bstats.shutdown();
9289
this.bstats = null;
9390
this.serverType = null;
94-
this.adventure = null;
9591
this.libraryManager = null;
9692
}
9793

‎src/main/java/me/adrigamer2950/adriapi/api/colors/Colors.java

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* You can also use a custom color code
1010
* system that's easier to remember than Bukkit one.
1111
*/
12-
@SuppressWarnings("deprecation")
1312
public class Colors {
1413

1514
/**

‎src/main/java/me/adrigamer2950/adriapi/api/logger/APILogger.java

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class APILogger extends Logger {
2828
* @param plugin The plugin
2929
*/
3030
public APILogger(@NonNull APIPlugin plugin) {
31-
//noinspection UnstableApiUsage
3231
this(plugin, plugin.getServer().getLogger());
3332
}
3433

@@ -37,7 +36,6 @@ public APILogger(@NonNull APIPlugin plugin) {
3736
* @param parent The logger's parent
3837
*/
3938
public APILogger(@NonNull APIPlugin plugin, @NonNull @NotNull Logger parent) {
40-
//noinspection deprecation
4139
this(
4240
plugin.getDescription().getPrefix() != null ? plugin.getDescription().getPrefix() : plugin.getDescription().getName(),
4341
parent

‎src/main/java/me/adrigamer2950/adriapi/api/user/User.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.adrigamer2950.adriapi.api.user;
22

3-
import me.adrigamer2950.adriapi.AdriAPI;
43
import net.kyori.adventure.text.Component;
54
import org.bukkit.command.CommandSender;
65
import org.bukkit.command.ConsoleCommandSender;
@@ -22,7 +21,7 @@ public interface User {
2221
* @return A User
2322
*/
2423
static User fromBukkitSender(CommandSender sender) {
25-
return new UserImpl(sender, AdriAPI.getPlugin(AdriAPI.class).getAdventure());
24+
return new UserImpl(sender);
2625
}
2726

2827
/**

‎src/main/java/me/adrigamer2950/adriapi/api/user/UserImpl.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package me.adrigamer2950.adriapi.api.user;
22

33
import me.adrigamer2950.adriapi.api.colors.Colors;
4-
import net.kyori.adventure.audience.Audience;
5-
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
64
import net.kyori.adventure.text.Component;
75
import org.bukkit.Bukkit;
86
import org.bukkit.command.CommandSender;
@@ -23,11 +21,9 @@
2321
public class UserImpl implements User {
2422

2523
private final CommandSender sender;
26-
private final Audience audience;
2724

28-
UserImpl(CommandSender sender, BukkitAudiences adventure) {
25+
UserImpl(CommandSender sender) {
2926
this.sender = sender;
30-
this.audience = adventure.sender(sender);
3127
}
3228

3329
@Override
@@ -69,7 +65,7 @@ public void sendMessage(String... messages) {
6965

7066
@Override
7167
public void sendMessage(Component component) {
72-
audience.sendMessage(component);
68+
sender.sendMessage(component);
7369
}
7470

7571
@Override
@@ -83,6 +79,7 @@ public String getName() {
8379
return sender.getName();
8480
}
8581

82+
@SuppressWarnings("removal")
8683
@Override
8784
public Component name() {
8885
return Component.text(this.getName());

‎src/main/java/me/adrigamer2950/adriapi/api/util/bStats.java

+2
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
414414
}
415415
}
416416

417+
@SuppressWarnings("DuplicatedCode")
417418
public static class MultiLineChart extends CustomChart {
418419

419420
private final Callable<Map<String, Integer>> callable;
@@ -454,6 +455,7 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
454455
}
455456
}
456457

458+
@SuppressWarnings("DuplicatedCode")
457459
public static class AdvancedPie extends CustomChart {
458460

459461
private final Callable<Map<String, Integer>> callable;

‎src/main/java/me/adrigamer2950/adriapi/listeners/ManagersListener.java

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class ManagersListener implements org.bukkit.event.Listener {
1313

1414
private final AdriAPI plugin;
1515

16-
@SuppressWarnings("deprecation")
1716
@EventHandler
1817
public void onPluginDisable(PluginDisableEvent e) {
1918
if (CommandManager.getManager(e.getPlugin()) != null) {

0 commit comments

Comments
 (0)
Please sign in to comment.