diff --git a/bukkit-post-1.13/pom.xml b/bukkit-post-1.13/pom.xml index fea6d405..e4692288 100644 --- a/bukkit-post-1.13/pom.xml +++ b/bukkit-post-1.13/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/bukkit-pre-1.13/pom.xml b/bukkit-pre-1.13/pom.xml index 4b290f80..b51723d2 100644 --- a/bukkit-pre-1.13/pom.xml +++ b/bukkit-pre-1.13/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/bukkit-shared/pom.xml b/bukkit-shared/pom.xml index 7248b4b0..f2c11858 100644 --- a/bukkit-shared/pom.xml +++ b/bukkit-shared/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml index c968d1d8..179bf979 100644 --- a/bungeecord/pom.xml +++ b/bungeecord/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 142e8b45..60ae55c6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/nukkit/pom.xml b/nukkit/pom.xml index 1dea9e6e..42a66b0e 100644 --- a/nukkit/pom.xml +++ b/nukkit/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/plugin-shared/pom.xml b/plugin-shared/pom.xml index 64032077..c7caeca9 100644 --- a/plugin-shared/pom.xml +++ b/plugin-shared/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/pom.xml b/pom.xml index 271873f0..4bb36802 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.buycraft BuycraftX pom - 12.0.8 + 12.1.0 common bukkit-shared diff --git a/sponge/pom.xml b/sponge/pom.xml index 349067de..5223c7e0 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -4,7 +4,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index b1258562..780523d4 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ BuycraftX net.buycraft - 12.0.8 + 12.1.0 4.0.0 @@ -127,13 +127,13 @@ com.velocitypowered velocity-api - 1.0.0-SNAPSHOT + 3.1.0 provided de.icongmbh.oss.maven.plugins javassist-maven-plugin - 1.1.0 + 2.0.2 provided diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftCommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftCommand.java index cfb3e749..cfd1c914 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftCommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftCommand.java @@ -1,17 +1,22 @@ package net.buycraft.plugin.velocity; +import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.Command; import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; +import com.velocitypowered.api.proxy.Player; import net.buycraft.plugin.velocity.command.Subcommand; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; -import net.kyori.text.format.TextDecoration; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; +import net.kyori.adventure.text.format.TextDecoration; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -public class BuycraftCommand implements Command { +public class BuycraftCommand implements SimpleCommand { private final Map subcommandMap = new LinkedHashMap<>(); private final BuycraftPlugin plugin; @@ -19,10 +24,13 @@ public BuycraftCommand(BuycraftPlugin plugin) { this.plugin = plugin; } + @Override - public void execute(CommandSource sender, String[] args) { + public void execute(SimpleCommand.Invocation invocation) { + CommandSource sender = invocation.source(); + String[] args = invocation.arguments(); if (!sender.hasPermission("buycraft.admin")) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("no_permission")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("no_permission")).color(NamedTextColor.RED)); return; } @@ -43,9 +51,9 @@ public void execute(CommandSource sender, String[] args) { } private void showHelp(CommandSource sender) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("usage")).color(TextColor.DARK_AQUA).decoration(TextDecoration.BOLD, true)); + sender.sendMessage(Component.text(plugin.getI18n().get("usage")).color(NamedTextColor.DARK_AQUA).decoration(TextDecoration.BOLD, true)); for (Map.Entry entry : subcommandMap.entrySet()) { - sender.sendMessage(TextComponent.of("/tebex " + entry.getKey()).color(TextColor.GREEN).append(TextComponent.of(": " + entry.getValue().getDescription()))); + sender.sendMessage(Component.text("/tebex " + entry.getKey()).color(NamedTextColor.GREEN).append(Component.text(": " + entry.getValue().getDescription()))); } } diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftPlugin.java b/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftPlugin.java index 56c1d943..a01f9388 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftPlugin.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/BuycraftPlugin.java @@ -187,7 +187,7 @@ public void onEnable(ProxyInitializeEvent event) { command.getSubcommandMap().put("info", new InformationSubcommand(this)); command.getSubcommandMap().put("report", new ReportCommand(this)); command.getSubcommandMap().put("coupon", new CouponSubcommand(this)); - getServer().getCommandManager().register(command, "tebex", "buycraft"); + getServer().getCommandManager().register("buycraft", command, "tebex"); // Send data to Keen IO if (serverInformation != null) { diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/VelocityBuycraftPlatform.java b/velocity/src/main/java/net/buycraft/plugin/velocity/VelocityBuycraftPlatform.java index 9a9a1096..6abf5993 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/VelocityBuycraftPlatform.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/VelocityBuycraftPlatform.java @@ -45,7 +45,7 @@ public PlaceholderManager getPlaceholderManager() { @Override public void dispatchCommand(String command) { - plugin.getServer().getCommandManager().execute(plugin.getServer().getConsoleCommandSource(), command); + plugin.getServer().getCommandManager().executeAsync(plugin.getServer().getConsoleCommandSource(), command); } @Override diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/command/CouponSubcommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/command/CouponSubcommand.java index 578c6fba..8e0412cf 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/command/CouponSubcommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/command/CouponSubcommand.java @@ -4,8 +4,10 @@ import net.buycraft.plugin.data.Coupon; import net.buycraft.plugin.shared.util.CouponUtil; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; import java.io.IOException; import java.util.Arrays; @@ -22,7 +24,7 @@ public CouponSubcommand(final BuycraftPlugin plugin) { @Override public void execute(CommandSource sender, String[] args) { if (args.length == 0) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("usage_coupon_subcommands")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("usage_coupon_subcommands")).color(NamedTextColor.RED)); return; } @@ -34,7 +36,7 @@ public void execute(CommandSource sender, String[] args) { deleteCoupon(sender, args); break; default: - sender.sendMessage(TextComponent.of(plugin.getI18n().get("usage_coupon_subcommands")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("usage_coupon_subcommands")).color(NamedTextColor.RED)); break; } } @@ -45,23 +47,23 @@ private void createCoupon(final CommandSource sender, String[] args) { try { coupon = CouponUtil.parseArguments(stripped); } catch (Exception e) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("coupon_creation_arg_parse_failure", e.getMessage())).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("coupon_creation_arg_parse_failure", e.getMessage())).color(NamedTextColor.RED)); return; } plugin.getPlatform().executeAsync(() -> { try { plugin.getApiClient().createCoupon(coupon).execute().body(); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("coupon_creation_success", coupon.getCode())).color(TextColor.GREEN)); + sender.sendMessage(Component.text(plugin.getI18n().get("coupon_creation_success", coupon.getCode())).color(NamedTextColor.GREEN)); } catch (IOException e) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("generic_api_operation_error")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("generic_api_operation_error")).color(NamedTextColor.RED)); } }); } private void deleteCoupon(final CommandSource sender, String[] args) { if (args.length != 2) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("no_coupon_specified")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("no_coupon_specified")).color(NamedTextColor.RED)); return; } @@ -69,9 +71,9 @@ private void deleteCoupon(final CommandSource sender, String[] args) { plugin.getPlatform().executeAsync(() -> { try { plugin.getApiClient().deleteCoupon(code).execute().body(); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("coupon_deleted")).color(TextColor.GREEN)); + sender.sendMessage(Component.text(plugin.getI18n().get("coupon_deleted")).color(NamedTextColor.GREEN)); } catch (IOException e) { - sender.sendMessage(TextComponent.of(e.getMessage()).color(TextColor.RED)); + sender.sendMessage(Component.text(e.getMessage()).color(NamedTextColor.RED)); } }); } diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/command/ForceCheckSubcommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/command/ForceCheckSubcommand.java index c3117c32..509b5b99 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/command/ForceCheckSubcommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/command/ForceCheckSubcommand.java @@ -2,8 +2,10 @@ import com.velocitypowered.api.command.CommandSource; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; public class ForceCheckSubcommand implements Subcommand { private final BuycraftPlugin plugin; @@ -15,22 +17,22 @@ public ForceCheckSubcommand(final BuycraftPlugin plugin) { @Override public void execute(CommandSource sender, String[] args) { if (args.length != 0) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("no_params")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("no_params")).color(NamedTextColor.RED)); return; } if (plugin.getApiClient() == null) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("need_secret_key")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("need_secret_key")).color(NamedTextColor.RED)); return; } if (plugin.getDuePlayerFetcher().inProgress()) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("already_checking_for_purchases")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("already_checking_for_purchases")).color(NamedTextColor.RED)); return; } plugin.getPlatform().executeAsync(() -> plugin.getDuePlayerFetcher().run(false)); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("forcecheck_queued")).color(TextColor.GREEN)); + sender.sendMessage(Component.text(plugin.getI18n().get("forcecheck_queued")).color(NamedTextColor.GREEN)); } @Override diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/command/InformationSubcommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/command/InformationSubcommand.java index 955f3f85..d41ed143 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/command/InformationSubcommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/command/InformationSubcommand.java @@ -2,8 +2,10 @@ import com.velocitypowered.api.command.CommandSource; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; public class InformationSubcommand implements Subcommand { private final BuycraftPlugin plugin; @@ -15,28 +17,28 @@ public InformationSubcommand(final BuycraftPlugin plugin) { @Override public void execute(CommandSource sender, String[] args) { if (args.length != 0) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("no_params")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("no_params")).color(NamedTextColor.RED)); return; } if (plugin.getApiClient() == null) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("need_secret_key")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("need_secret_key")).color(NamedTextColor.RED)); return; } if (plugin.getServerInformation() == null) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("information_no_server")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("information_no_server")).color(NamedTextColor.RED)); return; } - sender.sendMessage(TextComponent.of(plugin.getI18n().get("information_title")).color(TextColor.GRAY)); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("information_server", + sender.sendMessage(Component.text(plugin.getI18n().get("information_title")).color(NamedTextColor.GRAY)); + sender.sendMessage(Component.text(plugin.getI18n().get("information_server", plugin.getServerInformation().getServer().getName(), - plugin.getServerInformation().getAccount().getName())).color(TextColor.GRAY)); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("information_currency", - plugin.getServerInformation().getAccount().getCurrency().getIso4217())).color(TextColor.GRAY)); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("information_domain", - plugin.getServerInformation().getAccount().getDomain())).color(TextColor.GRAY)); + plugin.getServerInformation().getAccount().getName())).color(NamedTextColor.GRAY)); + sender.sendMessage(Component.text(plugin.getI18n().get("information_currency", + plugin.getServerInformation().getAccount().getCurrency().getIso4217())).color(NamedTextColor.GRAY)); + sender.sendMessage(Component.text(plugin.getI18n().get("information_domain", + plugin.getServerInformation().getAccount().getDomain())).color(NamedTextColor.GRAY)); } @Override diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/command/ReportCommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/command/ReportCommand.java index 852a7d51..57f6e2a4 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/command/ReportCommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/command/ReportCommand.java @@ -3,8 +3,10 @@ import com.velocitypowered.api.command.CommandSource; import net.buycraft.plugin.shared.util.ReportBuilder; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; import java.io.BufferedWriter; import java.io.IOException; @@ -25,7 +27,7 @@ public ReportCommand(BuycraftPlugin plugin) { @Override public void execute(final CommandSource sender, String[] args) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("report_wait")).color(TextColor.YELLOW)); + sender.sendMessage(Component.text(plugin.getI18n().get("report_wait")).color(NamedTextColor.YELLOW)); plugin.getPlatform().executeAsync(() -> { InetSocketAddress listener = plugin.getServer().getBoundAddress(); @@ -45,9 +47,9 @@ public void execute(final CommandSource sender, String[] args) { String generated = builder.generate(); try (BufferedWriter w = Files.newBufferedWriter(p, StandardCharsets.UTF_8, StandardOpenOption.CREATE_NEW)) { w.write(generated); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("report_saved", p.toAbsolutePath().toString())).color(TextColor.YELLOW)); + sender.sendMessage(Component.text(plugin.getI18n().get("report_saved", p.toAbsolutePath().toString())).color(NamedTextColor.YELLOW)); } catch (IOException e) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("report_cant_save")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("report_cant_save")).color(NamedTextColor.RED)); plugin.getLogger().info(generated); } }); diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/command/SecretSubcommand.java b/velocity/src/main/java/net/buycraft/plugin/velocity/command/SecretSubcommand.java index f27c8572..d5eb31cf 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/command/SecretSubcommand.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/command/SecretSubcommand.java @@ -4,8 +4,10 @@ import net.buycraft.plugin.BuyCraftAPI; import net.buycraft.plugin.data.responses.ServerInformation; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; import java.io.IOException; import java.util.logging.Level; @@ -20,12 +22,12 @@ public SecretSubcommand(final BuycraftPlugin plugin) { @Override public void execute(final CommandSource sender, final String[] args) { if (!sender.equals(plugin.getServer().getConsoleCommandSource())) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("secret_console_only")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("secret_console_only")).color(NamedTextColor.RED)); return; } if (args.length != 1) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("secret_need_key")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("secret_need_key")).color(NamedTextColor.RED)); return; } @@ -35,7 +37,7 @@ public void execute(final CommandSource sender, final String[] args) { plugin.updateInformation(client); } catch (IOException e) { plugin.getLogger().error("Unable to verify secret", e); - sender.sendMessage(TextComponent.of(plugin.getI18n().get("secret_does_not_work")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("secret_does_not_work")).color(NamedTextColor.RED)); return; } @@ -45,11 +47,11 @@ public void execute(final CommandSource sender, final String[] args) { try { plugin.saveConfiguration(); } catch (IOException e) { - sender.sendMessage(TextComponent.of(plugin.getI18n().get("secret_cant_be_saved")).color(TextColor.RED)); + sender.sendMessage(Component.text(plugin.getI18n().get("secret_cant_be_saved")).color(NamedTextColor.RED)); } - sender.sendMessage(TextComponent.of(plugin.getI18n().get("secret_success", - information.getServer().getName(), information.getAccount().getName())).color(TextColor.GREEN)); + sender.sendMessage(Component.text(plugin.getI18n().get("secret_success", + information.getServer().getName(), information.getAccount().getName())).color(NamedTextColor.GREEN)); plugin.getPlatform().executeAsync(plugin.getDuePlayerFetcher()); }); } diff --git a/velocity/src/main/java/net/buycraft/plugin/velocity/util/VersionCheck.java b/velocity/src/main/java/net/buycraft/plugin/velocity/util/VersionCheck.java index 6a98ed6d..bfc9bfea 100644 --- a/velocity/src/main/java/net/buycraft/plugin/velocity/util/VersionCheck.java +++ b/velocity/src/main/java/net/buycraft/plugin/velocity/util/VersionCheck.java @@ -5,8 +5,8 @@ import net.buycraft.plugin.data.responses.Version; import net.buycraft.plugin.shared.util.VersionUtil; import net.buycraft.plugin.velocity.BuycraftPlugin; -import net.kyori.text.TextComponent; -import net.kyori.text.format.TextColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import java.io.IOException; import java.util.concurrent.TimeUnit; @@ -50,7 +50,7 @@ public void verify() throws IOException { public void onPlayerJoin(final PostLoginEvent event) { if (event.getPlayer().hasPermission("buycraft.admin") && !upToDate) { plugin.getPlatform().executeAsyncLater(() -> - event.getPlayer().sendMessage(TextComponent.of(plugin.getI18n().get("update_available", lastKnownVersion.getVersion())).color(TextColor.YELLOW)), 3, TimeUnit.SECONDS); + event.getPlayer().sendMessage(Component.text(plugin.getI18n().get("update_available", lastKnownVersion.getVersion())).color(NamedTextColor.YELLOW)), 3, TimeUnit.SECONDS); } } diff --git a/velocity/src/main/java/org/kitteh/craftirc/sponge/util/versioning/Transform.java b/velocity/src/main/java/org/kitteh/craftirc/sponge/util/versioning/Transform.java index c96ef016..126c7fb3 100644 --- a/velocity/src/main/java/org/kitteh/craftirc/sponge/util/versioning/Transform.java +++ b/velocity/src/main/java/org/kitteh/craftirc/sponge/util/versioning/Transform.java @@ -41,13 +41,18 @@ public class Transform extends ClassTransformer { private String version; @Override - protected boolean shouldTransform(final CtClass clazz) throws NotFoundException { - CtClass buycraftPlugin = ClassPool.getDefault().get(BuycraftPlugin.class.getName()); - return !clazz.equals(buycraftPlugin) && clazz.subtypeOf(buycraftPlugin); + public boolean shouldTransform(final CtClass clazz) { + try { + CtClass buycraftPlugin = ClassPool.getDefault().get(BuycraftPlugin.class.getName()); + return !clazz.equals(buycraftPlugin) && clazz.subtypeOf(buycraftPlugin); + } catch (NotFoundException e) { + e.printStackTrace(); + return false; + } } @Override - protected void applyTransformations(CtClass clazz) throws Exception { + public void applyTransformations(CtClass clazz) { AnnotationsAttribute attribute = (AnnotationsAttribute) clazz.getClassFile().getAttribute(AnnotationsAttribute.visibleTag); Annotation annotation = attribute.getAnnotation("com.velocitypowered.api.plugin.Plugin"); StringMemberValue version = (StringMemberValue) annotation.getMemberValue("version");