suppress where fallback methods are implemented

This commit is contained in:
xGinko 2024-01-31 15:17:22 +01:00
parent ace4030de7
commit e3d33c6e79
3 changed files with 39 additions and 20 deletions

View File

@ -1,5 +1,6 @@
package me.xginko.villageroptimizer.commands.villageroptimizer.subcommands;
import io.papermc.paper.plugin.configuration.PluginMeta;
import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.commands.SubCommand;
import me.xginko.villageroptimizer.enums.permissions.Commands;
@ -28,26 +29,42 @@ public class VersionSubCmd extends SubCommand {
}
@Override
@SuppressWarnings({"deprecation", "UnstableApiUsage"})
public void perform(CommandSender sender, String[] args) {
if (sender.hasPermission(Commands.VERSION.get())) {
final PluginDescriptionFile pluginYML = VillagerOptimizer.getInstance().getDescription();
sender.sendMessage(
Component.newline()
.append(
Component.text(pluginYML.getName()+" "+pluginYML.getVersion())
.style(VillagerOptimizer.plugin_style)
.clickEvent(ClickEvent.openUrl(pluginYML.getWebsite()))
)
.append(Component.text(" by ").color(NamedTextColor.GRAY))
.append(
Component.text(pluginYML.getAuthors().get(0))
.color(NamedTextColor.WHITE)
.clickEvent(ClickEvent.openUrl("https://github.com/xGinko"))
)
.append(Component.newline())
);
} else {
if (!sender.hasPermission(Commands.VERSION.get())) {
sender.sendMessage(VillagerOptimizer.getLang(sender).no_permission);
return;
}
String name, version, website, author;
try {
final PluginMeta pluginMeta = VillagerOptimizer.getInstance().getPluginMeta();
name = pluginMeta.getName();
version = pluginMeta.getVersion();
website = pluginMeta.getWebsite();
author = pluginMeta.getAuthors().get(0);
} catch (Throwable versionIncompatible) {
final PluginDescriptionFile pluginYML = VillagerOptimizer.getInstance().getDescription();
name = pluginYML.getName();
version = pluginYML.getVersion();
website = pluginYML.getWebsite();
author = pluginYML.getAuthors().get(0);
}
sender.sendMessage(Component.newline()
.append(
Component.text(name + " " + version)
.style(VillagerOptimizer.plugin_style)
.clickEvent(ClickEvent.openUrl(website))
)
.append(Component.text(" by ").color(NamedTextColor.GRAY))
.append(
Component.text(author)
.color(NamedTextColor.WHITE)
.clickEvent(ClickEvent.openUrl("https://github.com/xGinko"))
)
.append(Component.newline())
);
}
}

View File

@ -8,6 +8,7 @@ import java.io.File;
import java.util.List;
import java.util.Locale;
@SuppressWarnings({"ALL", "EscapedSpace"})
public class Config {
private final @NotNull ConfigFile config;
@ -52,7 +53,7 @@ public class Config {
this.createTitledSection("Optimization", "optimization-methods");
this.config.addDefault("optimization-methods.commands.unoptimizevillagers", null);
this.config.addComment("optimization-methods.commands", """
If you want to disable commands, negate the following permissions:\s
If you want to disable commands, negate the following permissions:\s
villageroptimizer.cmd.optimize\s
villageroptimizer.cmd.unoptimize
""");

View File

@ -54,6 +54,7 @@ public class EnableLeashingVillagers implements VillagerOptimizerModule, Listene
return VillagerOptimizer.getConfiguration().getBoolean("gameplay.villagers-can-be-leashed.enable", false);
}
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
private void onLeash(PlayerInteractEntityEvent event) {
if (!event.getRightClicked().getType().equals(EntityType.VILLAGER)) return;
@ -80,7 +81,7 @@ public class EnableLeashingVillagers implements VillagerOptimizerModule, Listene
PlayerLeashEntityEvent leashEvent;
try {
leashEvent = new PlayerLeashEntityEvent(villager, player, player, event.getHand());
} catch (Throwable versionException) {
} catch (Throwable versionIncompatible) {
leashEvent = new PlayerLeashEntityEvent(villager, player, player);
}