diff --git a/src/main/java/eu/mhsl/craftattack/spawn/Main.java b/src/main/java/eu/mhsl/craftattack/spawn/Main.java index edb907b..4c460bb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/Main.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/Main.java @@ -26,10 +26,10 @@ public final class Main extends JavaPlugin { public void onEnable() { instance = this; logger = instance().getLogger(); - saveDefaultConfig(); + this.saveDefaultConfig(); try { this.wrappedEnable(); - } catch (Exception e) { + } catch(Exception e) { Main.logger().log(Level.SEVERE, "Error while initializing Spawn plugin, shutting down!", e); Bukkit.shutdown(); } @@ -52,31 +52,31 @@ public final class Main extends JavaPlugin { .map(applianceClass -> { try { return (Appliance) applianceClass.getDeclaredConstructor().newInstance(); - } catch (Exception e) { + } catch(Exception e) { throw new RuntimeException(String.format("Failed to create instance of '%s'", applianceClass.getName()), e); } }) .toList(); - Main.logger().info(String.format("Loaded %d appliances!", appliances.size())); + Main.logger().info(String.format("Loaded %d appliances!", this.appliances.size())); Main.logger().info("Initializing appliances..."); this.appliances.forEach(appliance -> { appliance.onEnable(); appliance.initialize(this); }); - Main.logger().info(String.format("Initialized %d appliances!", appliances.size())); + Main.logger().info(String.format("Initialized %d appliances!", this.appliances.size())); Main.logger().info("Starting HTTP API..."); new HttpServer(); - getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); + this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); Main.logger().info("Startup complete!"); } @Override public void onDisable() { Main.logger().info("Disabling appliances..."); - appliances.forEach(appliance -> { + this.appliances.forEach(appliance -> { Main.logger().info("Disabling " + appliance.getClass().getSimpleName()); appliance.onDisable(); appliance.destruct(this); @@ -84,7 +84,7 @@ public final class Main extends JavaPlugin { HandlerList.unregisterAll(this); Bukkit.getScheduler().cancelTasks(this); - Main.logger().info("Disabled " + appliances.size() + " appliances!"); + Main.logger().info("Disabled " + this.appliances.size() + " appliances!"); } public T getAppliance(Class clazz) { @@ -101,7 +101,7 @@ public final class Main extends JavaPlugin { } public List getAppliances() { - return appliances; + return this.appliances; } public RepositoryLoader getRepositoryLoader() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/api/client/HttpRepository.java b/src/main/java/eu/mhsl/craftattack/spawn/api/client/HttpRepository.java index b218771..3cf1e77 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/api/client/HttpRepository.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/api/client/HttpRepository.java @@ -19,17 +19,21 @@ public abstract class HttpRepository extends Repository { public HttpRepository(URI basePath) { this(basePath, null); } + public HttpRepository(URI basePath, @Nullable Consumer baseUriBuilder) { super(basePath); this.baseUriBuilder = baseUriBuilder == null - ? uriBuilder -> {} + ? uriBuilder -> { + } : baseUriBuilder; } protected ReqResp post(String command, TInput data, Class outputType) { - return this.post(command, parameters -> {}, data, outputType); + return this.post(command, parameters -> { + }, data, outputType); } + protected ReqResp post(String command, Consumer parameters, TInput data, Class outputType) { HttpRequest request = this.getRequestBuilder(this.getUri(command, parameters)) .POST(HttpRequest.BodyPublishers.ofString(this.gson.toJson(data))) @@ -39,8 +43,10 @@ public abstract class HttpRepository extends Repository { } protected ReqResp get(String command, Class outputType) { - return this.get(command, parameters -> {}, outputType); + return this.get(command, parameters -> { + }, outputType); } + protected ReqResp get(String command, Consumer parameters, Class outputType) { HttpRequest request = this.getRequestBuilder(this.getUri(command, parameters)) .GET() @@ -55,7 +61,7 @@ public abstract class HttpRepository extends Repository { this.baseUriBuilder.accept(builder); parameters.accept(builder); return builder.build(); - } catch (URISyntaxException e) { + } catch(URISyntaxException e) { throw new RuntimeException(e); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/api/client/Repository.java b/src/main/java/eu/mhsl/craftattack/spawn/api/client/Repository.java index 17ea323..b45e360 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/api/client/Repository.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/api/client/Repository.java @@ -14,7 +14,7 @@ public abstract class Repository { this.basePath = basePath; this.gson = new Gson(); } - + protected void validateThread(String commandName) { if(!Bukkit.isPrimaryThread()) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/api/client/RepositoryLoader.java b/src/main/java/eu/mhsl/craftattack/spawn/api/client/RepositoryLoader.java index 637a79b..29d6578 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/api/client/RepositoryLoader.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/api/client/RepositoryLoader.java @@ -25,7 +25,8 @@ public class RepositoryLoader { .map(repository -> { try { return (Repository) repository.getDeclaredConstructor().newInstance(); - } catch(InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + } catch(InstantiationException | IllegalAccessException | InvocationTargetException | + NoSuchMethodException e) { throw new RuntimeException(e); } }) @@ -42,6 +43,6 @@ public class RepositoryLoader { } public List getRepositories() { - return repositories; + return this.repositories; } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/FeedbackRepository.java b/src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/FeedbackRepository.java index da70b9c..b896f2f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/FeedbackRepository.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/FeedbackRepository.java @@ -15,10 +15,12 @@ public class FeedbackRepository extends HttpRepository { super(WebsiteApiUtil.getBaseUri(), WebsiteApiUtil::withAuthorizationSecret); } - public record Request(String event, List users) {} + public record Request(String event, List users) { + } public ReqResp> createFeedbackUrls(Request data) { - final Type responseType = new TypeToken>(){}.getType(); + final Type responseType = new TypeToken>() { + }.getType(); ReqResp rawData = this.post("feedback", data, Object.class); return new ReqResp<>(rawData.status(), this.gson.fromJson(this.gson.toJson(rawData.data()), responseType)); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java index ea400c1..8dfe391 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java @@ -73,8 +73,8 @@ public abstract class Appliance { */ @NotNull public ConfigurationSection localConfig() { - return Optional.ofNullable(Configuration.cfg.getConfigurationSection(localConfigPath)) - .orElseGet(() -> Configuration.cfg.createSection(localConfigPath)); + return Optional.ofNullable(Configuration.cfg.getConfigurationSection(this.localConfigPath)) + .orElseGet(() -> Configuration.cfg.createSection(this.localConfigPath)); } public void onEnable() { @@ -84,15 +84,15 @@ public abstract class Appliance { } public void initialize(@NotNull JavaPlugin plugin) { - this.listeners = listeners(); - this.commands = commands(); + this.listeners = this.listeners(); + this.commands = this.commands(); - listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin)); - commands.forEach(command -> setCommandExecutor(plugin, command.commandName, command)); + this.listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin)); + this.commands.forEach(command -> this.setCommandExecutor(plugin, command.commandName, command)); } public void destruct(@NotNull JavaPlugin plugin) { - listeners.forEach(HandlerList::unregisterAll); + this.listeners.forEach(HandlerList::unregisterAll); } protected T queryAppliance(Class clazz) { @@ -115,10 +115,10 @@ public abstract class Appliance { } public List getListeners() { - return listeners; + return this.listeners; } public List> getCommands() { - return commands; + return this.commands; } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliance/ApplianceCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliance/ApplianceCommand.java index f031610..4f16c82 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliance/ApplianceCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliance/ApplianceCommand.java @@ -33,12 +33,12 @@ public abstract class ApplianceCommand extends CachedApplia @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { try { - execute(sender, command, label, args); + this.execute(sender, command, label, args); } catch(Error e) { - sender.sendMessage(errorMessage.append(Component.text(e.getMessage()))); + sender.sendMessage(this.errorMessage.append(Component.text(e.getMessage()))); } catch(Exception e) { - sender.sendMessage(errorMessage.append(Component.text("Interner Fehler"))); - Main.logger().warning("Error executing appliance command " + commandName + ": " + e.getMessage()); + sender.sendMessage(this.errorMessage.append(Component.text("Interner Fehler"))); + Main.logger().warning("Error executing appliance command " + this.commandName + ": " + e.getMessage()); e.printStackTrace(System.err); return false; } @@ -80,7 +80,7 @@ public abstract class ApplianceCommand extends CachedApplia @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { if(!(sender instanceof Player)) { - sender.sendMessage(notPlayerMessage); + sender.sendMessage(this.notPlayerMessage); return false; } this.player = (Player) sender; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliance/CachedApplianceSupplier.java b/src/main/java/eu/mhsl/craftattack/spawn/appliance/CachedApplianceSupplier.java index b4aa4a9..72cafe6 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliance/CachedApplianceSupplier.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliance/CachedApplianceSupplier.java @@ -6,7 +6,7 @@ public class CachedApplianceSupplier implements IApplianceS private final T appliance; public CachedApplianceSupplier() { - this.appliance = Main.instance().getAppliance(Main.getApplianceType(getClass())); + this.appliance = Main.instance().getAppliance(Main.getApplianceType(this.getClass())); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java index b7db6f2..0b60aa7 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java @@ -11,7 +11,7 @@ import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.List; public class AcInform extends Appliance { public void processCommand(@NotNull String[] args) { @@ -22,8 +22,8 @@ public class AcInform extends Appliance { for(int i = 0; i < args.length; i++) { if(!args[i].startsWith("--")) continue; - if(i == args.length-1) continue; - String nextArgument = args[i+1]; + if(i == args.length - 1) continue; + String nextArgument = args[i + 1]; if(nextArgument.startsWith("--")) continue; switch(args[i]) { @@ -42,7 +42,8 @@ public class AcInform extends Appliance { Component prefix = Component.text("# ", NamedTextColor.DARK_RED); NamedTextColor textColor = NamedTextColor.GRAY; - if(playerName == null || playerName.isBlank()) throw new ApplianceCommand.Error("acinform command needs a player (--playerName)"); + if(playerName == null || playerName.isBlank()) + throw new ApplianceCommand.Error("acinform command needs a player (--playerName)"); if(anticheatName != null && !anticheatName.isBlank()) { component.append( @@ -66,7 +67,7 @@ public class AcInform extends Appliance { if(checkName == null || checkName.isBlank()) { component.append(Component.text("got detected by Anticheat", textColor)); - } else if(violationCount != null){ + } else if(violationCount != null) { component.append( Component.text("failed ", textColor) .append(Component.text(String.format("%sx ", violationCount), NamedTextColor.WHITE)) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java index 149cd46..c914229 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java @@ -14,6 +14,6 @@ public class AcInformCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { if(sender instanceof Player) throw new ApplianceCommand.Error("Dieser Command ist nicht für Spieler!"); - getAppliance().processCommand(args); + this.getAppliance().processCommand(args); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java index 71b2522..3477028 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java @@ -17,6 +17,6 @@ public class AdminChatCommand extends ApplianceCommand.PlayerChecked if(!sender.hasPermission("admin")) return; String message = String.join(" ", args); - getAppliance().sendMessage(getPlayer(), message); + this.getAppliance().sendMessage(this.getPlayer(), message); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java index 4c758f9..0751b4f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java @@ -10,21 +10,21 @@ import org.bukkit.event.player.PlayerMoveEvent; public class AfkResetListener extends ApplianceListener { @EventHandler public void onMove(PlayerMoveEvent event) { - getAppliance().resetTiming(event.getPlayer()); + this.getAppliance().resetTiming(event.getPlayer()); } @EventHandler public void onInteract(PlayerInteractEvent event) { - getAppliance().resetTiming(event.getPlayer()); + this.getAppliance().resetTiming(event.getPlayer()); } @EventHandler public void onChat(AsyncChatEvent event) { - getAppliance().resetTiming(event.getPlayer()); + this.getAppliance().resetTiming(event.getPlayer()); } @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().resetTiming(event.getPlayer()); + this.getAppliance().resetTiming(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java index d2246a3..7c5dadf 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java @@ -13,7 +13,10 @@ import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.UUID; public class AfkTag extends Appliance implements DisplayName.Prefixed { private final HashMap afkTimings = new HashMap<>(); @@ -31,9 +34,9 @@ public class AfkTag extends Appliance implements DisplayName.Prefixed { } public void resetTiming(Player player) { - boolean wasAfk = isAfk(player); + boolean wasAfk = this.isAfk(player); this.afkTimings.put(player.getUniqueId(), System.currentTimeMillis()); - if (wasAfk) this.updateAfkPrefix(player); + if(wasAfk) this.updateAfkPrefix(player); } private void checkAfkPlayers() { @@ -58,7 +61,7 @@ public class AfkTag extends Appliance implements DisplayName.Prefixed { @Override public @Nullable Component getNamePrefix(Player player) { - if(isAfk(player)) return Component.text("[ᵃᶠᵏ]", NamedTextColor.GRAY) + if(this.isAfk(player)) return Component.text("[ᵃᶠᵏ]", NamedTextColor.GRAY) .hoverEvent(HoverEvent.showText(Component.text("Der Spieler ist AFK"))); return null; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java index e93383d..413fb9c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java @@ -10,6 +10,6 @@ public class OnSignEditListener extends ApplianceListener { public void onEdit(PlayerOpenSignEvent event) { if(event.getCause().equals(PlayerOpenSignEvent.Cause.PLACE)) return; SignSide signSide = event.getSign().getSide(event.getSide()); - event.setCancelled(getAppliance().preventSignEdit(event.getPlayer(), signSide)); + event.setCancelled(this.getAppliance().preventSignEdit(event.getPlayer(), signSide)); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java index b8bc57a..da39ecb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java @@ -31,7 +31,8 @@ public class AutoShulker extends Appliance { ShulkerBox shulkerBox = (ShulkerBox) blockStateMeta.getBlockState(); HashMap leftOver = shulkerBox.getInventory().addItem(itemStack); - if(leftOver.size() > 1) throw new IllegalStateException("Multiple ItemStacks cannot be processed by AutoShulker!"); + if(leftOver.size() > 1) + throw new IllegalStateException("Multiple ItemStacks cannot be processed by AutoShulker!"); if(itemStack.equals(leftOver.get(0))) { p.sendActionBar(Component.text("Die Shulkerbox ist voll!", NamedTextColor.RED)); return false; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java index bd6b8c6..277fe55 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java @@ -14,7 +14,7 @@ public class ItemPickupListener extends ApplianceListener { SelectSetting.Options.Option setting = Settings.instance().getSetting(p, Settings.Key.AutoShulker, SelectSetting.Options.Option.class); if(setting.is(AutoShulkerSetting.disabled)) return; if(setting.is(AutoShulkerSetting.notFromPlayers) && event.getItem().getThrower() != null) return; - event.setCancelled(getAppliance().tryAutoShulker(p, event.getItem())); + event.setCancelled(this.getAppliance().tryAutoShulker(p, event.getItem())); } } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java index e2cb490..5581138 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java @@ -56,7 +56,7 @@ public class ChatMention extends Appliance { @Override public void onEnable() { Settings.instance().declareSetting(ChatMentionSetting.class); - refreshPlayers(); + this.refreshPlayers(); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java index 13a32c9..64f88ce 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java @@ -30,11 +30,11 @@ public class ChatMentionListener extends ApplianceListener { Component result = words.stream() .map(word -> { String wordWithoutAnnotation = word.replace("@", ""); - boolean isPlayer = getAppliance().getPlayerNames().contains(wordWithoutAnnotation); + boolean isPlayer = this.getAppliance().getPlayerNames().contains(wordWithoutAnnotation); if(isPlayer && config.applyMentions()) { mentioned.add(wordWithoutAnnotation); Component mention = Component.text( - getAppliance().formatPlayer(wordWithoutAnnotation), + this.getAppliance().formatPlayer(wordWithoutAnnotation), NamedTextColor.GOLD ); return chatMessages.addReportActions(mention, wordWithoutAnnotation); @@ -45,12 +45,12 @@ public class ChatMentionListener extends ApplianceListener { .reduce(ComponentUtil::appendWithSpace) .orElseThrow(); - getAppliance().notifyPlayers(mentioned); + this.getAppliance().notifyPlayers(mentioned); event.result(result); } @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().refreshPlayers(); + this.getAppliance().refreshPlayers(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java index a54f6a8..1734cf9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java @@ -15,7 +15,8 @@ public class ChatMentionSetting extends MultiBoolSetting { event.renderer( (source, sourceDisplayName, message, viewer) -> Component.text("") - .append(getAppliance().getReportablePlayerName(source)) + .append(this.getAppliance().getReportablePlayerName(source)) .append(Component.text(" > ").color(TextColor.color(Color.GRAY.asRGB()))) .append(message).color(TextColor.color(Color.SILVER.asRGB())) ); @@ -35,7 +35,7 @@ public class ChatMessagesListener extends ApplianceListener { player.sendMessage( Component .text(">>> ").color(NamedTextColor.GREEN) - .append(getAppliance().getReportablePlayerName(event.getPlayer())) + .append(this.getAppliance().getReportablePlayerName(event.getPlayer())) ); }); } @@ -48,7 +48,7 @@ public class ChatMessagesListener extends ApplianceListener { player.sendMessage( Component .text("<<< ").color(NamedTextColor.RED) - .append(getAppliance().getReportablePlayerName(event.getPlayer())) + .append(this.getAppliance().getReportablePlayerName(event.getPlayer())) ); }); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java index 1dc82d2..832e1a8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java @@ -25,7 +25,7 @@ public class CustomAdvancements extends Appliance { public void grantAdvancement(String advancementName, UUID playerUUID) { Player player = Bukkit.getPlayer(playerUUID); if(player == null) { - addPendingAdvancement(playerUUID, advancementName); + this.addPendingAdvancement(playerUUID, advancementName); return; } @@ -33,7 +33,7 @@ public class CustomAdvancements extends Appliance { NamespacedKey namespacedKey = Objects.requireNonNull(NamespacedKey.fromString("custom_advancements:craftattack/" + advancementName), "NamespacedKey is invalid!"); Advancement advancement = Objects.requireNonNull(Bukkit.getAdvancement(namespacedKey), "The advancement does not exist!"); player.getAdvancementProgress(advancement).awardCriteria("criteria"); - } catch (Exception e) { + } catch(Exception e) { Main.logger().info("Advancement " + advancementName + " not found! (is Custom Advancements data pack loaded?)"); throw e; } @@ -41,14 +41,14 @@ public class CustomAdvancements extends Appliance { public void applyPendingAdvancements(Player player) { if(this.pendingAdvancements.isEmpty()) return; - List grantedAdvancements = pendingAdvancements.stream() + List grantedAdvancements = this.pendingAdvancements.stream() .filter(pendingAdvancement -> pendingAdvancement.receiver.equals(player.getUniqueId())).toList(); this.pendingAdvancements.removeAll(grantedAdvancements); - grantedAdvancements.forEach(pendingAdvancement -> grantAdvancement(pendingAdvancement.advancement(), player.getUniqueId())); + grantedAdvancements.forEach(pendingAdvancement -> this.grantAdvancement(pendingAdvancement.advancement(), player.getUniqueId())); } private void addPendingAdvancement(UUID receiver, String advancement) { - pendingAdvancements.add(new PendingAdvancement(receiver, advancement)); + this.pendingAdvancements.add(new PendingAdvancement(receiver, advancement)); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java index 4390fdf..15cb7ed 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java @@ -8,6 +8,6 @@ import org.bukkit.event.player.PlayerJoinEvent; public class ApplyPendingAdvancementsListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().applyPendingAdvancements(event.getPlayer()); + this.getAppliance().applyPendingAdvancements(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java index ace859e..91636df 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java @@ -20,7 +20,7 @@ public class CustomAdvancementsListener extends ApplianceListener { .appendNewline() .append( Component - .text("Erster Besuch: " + formatUnixTimestamp(player.getFirstPlayed()), NamedTextColor.GRAY) + .text("Erster Besuch: " + this.formatUnixTimestamp(player.getFirstPlayed()), NamedTextColor.GRAY) .clickEvent(ClickEvent.copyToClipboard(String.valueOf(player.getFirstPlayed()))) ) .appendNewline() .append( Component - .text("Letzter Besuch: " + formatUnixTimestamp(player.getLastSeen()), NamedTextColor.GRAY) + .text("Letzter Besuch: " + this.formatUnixTimestamp(player.getLastSeen()), NamedTextColor.GRAY) .clickEvent(ClickEvent.copyToClipboard(String.valueOf(player.getLastSeen()))) ) .appendNewline() diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java index 765e2b7..2afb064 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java @@ -27,16 +27,17 @@ import java.util.logging.Level; public class DisplayName extends Appliance { public interface Prefixed { - @Nullable Component getNamePrefix(Player player); + @Nullable + Component getNamePrefix(Player player); } public void update(Player player) { - TextColor playerColor = queryAppliance(AdminMarker.class).getPlayerColor(player); + TextColor playerColor = this.queryAppliance(AdminMarker.class).getPlayerColor(player); List> prefixes = List.of( - () -> queryAppliance(Outlawed.class).getNamePrefix(player), - () -> queryAppliance(YearRank.class).getNamePrefix(player), - () -> queryAppliance(AfkTag.class).getNamePrefix(player), - () -> queryAppliance(SleepTag.class).getNamePrefix(player) + () -> this.queryAppliance(Outlawed.class).getNamePrefix(player), + () -> this.queryAppliance(YearRank.class).getNamePrefix(player), + () -> this.queryAppliance(AfkTag.class).getNamePrefix(player), + () -> this.queryAppliance(SleepTag.class).getNamePrefix(player) ); ComponentBuilder playerName = Component.text(); @@ -61,7 +62,7 @@ public class DisplayName extends Appliance { playerName.append(Component.text(player.getName(), playerColor)); - setGlobal(player, playerName.build()); + this.setGlobal(player, playerName.build()); } private void setGlobal(Player player, Component component) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java index ac5b109..5df3e35 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java @@ -8,6 +8,6 @@ import org.bukkit.event.player.PlayerJoinEvent; public class DisplayNameUpdateListener extends ApplianceListener { @EventHandler(priority = EventPriority.LOWEST) public void onJoin(PlayerJoinEvent event) { - getAppliance().update(event.getPlayer()); + this.getAppliance().update(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java index 66fd59c..0e6b61d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java @@ -19,9 +19,9 @@ public class DoubleDoor extends Appliance { public void openNextDoor(Block block) { BlockData clickedData = block.getBlockData(); - if (!(clickedData instanceof Door clickedDoor)) return; + if(!(clickedData instanceof Door clickedDoor)) return; - BlockFace neighborFace = getNeighborFace(clickedDoor.getFacing(), clickedDoor.getHinge()); + BlockFace neighborFace = this.getNeighborFace(clickedDoor.getFacing(), clickedDoor.getHinge()); Block neighbourBlock = block.getRelative(neighborFace); BlockData neighbourData = neighbourBlock.getBlockData(); @@ -39,7 +39,8 @@ public class DoubleDoor extends Appliance { case WEST -> (hinge == Door.Hinge.RIGHT) ? BlockFace.SOUTH : BlockFace.NORTH; case SOUTH -> (hinge == Door.Hinge.RIGHT) ? BlockFace.EAST : BlockFace.WEST; case NORTH -> (hinge == Door.Hinge.RIGHT) ? BlockFace.WEST : BlockFace.EAST; - default -> throw new IllegalStateException(String.format("BlockFace '%s' of clicked door is not valid!", face)); + default -> + throw new IllegalStateException(String.format("BlockFace '%s' of clicked door is not valid!", face)); }; } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java index 0a5e676..d7ca5ce 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java @@ -22,6 +22,6 @@ public class OnDoorInteractListener extends ApplianceListener { if(clickedBlock == null) return; if(clickedBlock.getType().equals(Material.IRON_DOOR)) return; if(!Settings.instance().getSetting(event.getPlayer(), Settings.Key.DoubleDoors, Boolean.class)) return; - getAppliance().openNextDoor(clickedBlock); + this.getAppliance().openNextDoor(clickedBlock); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java index 2013ad9..21faabb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java @@ -14,17 +14,17 @@ public class EndPrevent extends Appliance { public EndPrevent() { super("endPrevent"); - this.endDisabled = localConfig().getBoolean(endDisabledKey); + this.endDisabled = this.localConfig().getBoolean(this.endDisabledKey); } public void setEndDisabled(boolean disabled) { - localConfig().set(endDisabledKey, disabled); + this.localConfig().set(this.endDisabledKey, disabled); Configuration.saveChanges(); this.endDisabled = disabled; } public boolean isEndDisabled() { - return endDisabled; + return this.endDisabled; } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java index 863b703..d07439e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java @@ -20,18 +20,18 @@ public class EndPreventCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - if(args.length == 1 && arguments.containsKey(args[0])) { - getAppliance().setEndDisabled(arguments.get(args[0])); + if(args.length == 1 && this.arguments.containsKey(args[0])) { + this.getAppliance().setEndDisabled(this.arguments.get(args[0])); sender.sendMessage(Component.text("Setting updated!", NamedTextColor.GREEN)); } sender.sendMessage(Component.text( - String.format("The End is %s!", getAppliance().isEndDisabled() ? "open" : "closed"), + String.format("The End is %s!", this.getAppliance().isEndDisabled() ? "open" : "closed"), NamedTextColor.GOLD )); } @Override public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - return arguments.keySet().stream().toList(); + return this.arguments.keySet().stream().toList(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java index 078c848..43d3532 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java @@ -15,7 +15,7 @@ public class PreventEnderEyeUseListener extends ApplianceListener { if(event.getItem() == null) return; if(!event.getItem().getType().equals(Material.ENDER_EYE)) return; - if(!getAppliance().isEndDisabled()) return; + if(!this.getAppliance().isEndDisabled()) return; event.setCancelled(true); event.getPlayer().sendActionBar(Component.text("Das End ist noch nicht freigeschaltet!", NamedTextColor.RED)); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java index cfd486a..4b3f2a1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java @@ -13,6 +13,6 @@ public class EventAdvertiseCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().advertise(); + this.getAppliance().advertise(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java index 634d61c..8367a91 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java @@ -13,6 +13,6 @@ public class EventCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().joinEvent(getPlayer()); + this.getAppliance().joinEvent(this.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java index 018bfd0..42620af 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java @@ -13,6 +13,6 @@ public class EventEndSessionCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - getAppliance().endEvent(); + this.getAppliance().endEvent(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java index dfcd880..addf32a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java @@ -15,7 +15,7 @@ public class EventOpenSessionCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().openEvent(); + this.getAppliance().openEvent(); sender.sendMessage(Component.text("Event-Server erfolgreich gestartet!", NamedTextColor.GREEN)); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java index b1f3428..9a034f6 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java @@ -13,6 +13,6 @@ public class MoveEventVillagerCommand extends ApplianceCommand.PlayerChecked { @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().applyPendingRewards(event.getPlayer()); + this.getAppliance().applyPendingRewards(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java index cbcdfcb..79eb2c0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java @@ -19,7 +19,9 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class Feedback extends Appliance { public Feedback() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java index d14b0dc..c375088 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java @@ -17,6 +17,6 @@ public class FeedbackCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { sender.sendMessage(ComponentUtil.pleaseWait()); - getAppliance().requestFeedback("self-issued-ingame", List.of(getPlayer()), null); + this.getAppliance().requestFeedback("self-issued-ingame", List.of(this.getPlayer()), null); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java index c7161d9..d451909 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java @@ -16,6 +16,6 @@ public class RequestFeedbackCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().requestFeedback("admin-issued-ingame", new ArrayList<>(Bukkit.getOnlinePlayers()), String.join(" ", args)); + this.getAppliance().requestFeedback("admin-issued-ingame", new ArrayList<>(Bukkit.getOnlinePlayers()), String.join(" ", args)); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java index 833ea6f..7bd89b0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java @@ -13,6 +13,6 @@ public class FleischerchestCraftItemListener extends ApplianceListener { @EventHandler public void onEat(PlayerItemConsumeEvent event) { - if(event.getItem().getType().equals(Material.GLOW_BERRIES)) getAppliance().letPlayerGlow(event.getPlayer()); + if(event.getItem().getType().equals(Material.GLOW_BERRIES)) this.getAppliance().letPlayerGlow(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java index 634c89c..7d6164a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java @@ -19,8 +19,8 @@ public class SpawnCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if(!getAppliance().localConfig().isString(spawnKey)) + if(!this.getAppliance().localConfig().isString(spawnKey)) throw new ApplianceCommand.Error("Es wurde kein Spawnbereich hinterlegt!"); - sender.sendMessage(Component.text(Objects.requireNonNull(getAppliance().localConfig().getString(spawnKey)), NamedTextColor.GOLD)); + sender.sendMessage(Component.text(Objects.requireNonNull(this.getAppliance().localConfig().getString(spawnKey)), NamedTextColor.GOLD)); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java index 3dbb73c..77c1e08 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java @@ -17,12 +17,12 @@ public class TeamspeakCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if(!getAppliance().localConfig().isString(teamspeakKey)) + if(!this.getAppliance().localConfig().isString(teamspeakKey)) throw new ApplianceCommand.Error("Es wurde kein Teamspeak hinterlegt!"); sender.sendMessage( Component.text() .append(Component.text("Joine unserem Teamspeak: ", NamedTextColor.GOLD)) - .append(getTeamspeakIp(getAppliance().localConfig().getString(teamspeakKey))) + .append(this.getTeamspeakIp(this.getAppliance().localConfig().getString(teamspeakKey))) ); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java index 2ff2635..74d60fb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java @@ -24,21 +24,21 @@ public class HotbarRefillListener extends ApplianceListener { if(stackInHand.getAmount() != 1) return; if(stackInHand.getType().getMaxDurability() > 0) return; - if(!getPlayerSetting(event.getPlayer()).onBlocks()) return; - getAppliance().handleHotbarChange(event.getPlayer(), stackInHand); + if(!this.getPlayerSetting(event.getPlayer()).onBlocks()) return; + this.getAppliance().handleHotbarChange(event.getPlayer(), stackInHand); } @EventHandler public void onPlayerItemBreak(PlayerItemBreakEvent event) { - if(!getPlayerSetting(event.getPlayer()).onTools()) return; + if(!this.getPlayerSetting(event.getPlayer()).onTools()) return; - getAppliance().handleHotbarChange(event.getPlayer(), event.getBrokenItem()); + this.getAppliance().handleHotbarChange(event.getPlayer(), event.getBrokenItem()); } @EventHandler public void onPlayerItemConsume(PlayerItemConsumeEvent event) { - if(!getPlayerSetting(event.getPlayer()).onConsumable()) return; + if(!this.getPlayerSetting(event.getPlayer()).onConsumable()) return; - getAppliance().handleHotbarChange(event.getPlayer(), event.getItem()); + this.getAppliance().handleHotbarChange(event.getPlayer(), event.getItem()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java index 25397f0..8968415 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java @@ -16,7 +16,8 @@ public class HotbarRefillSetting extends MultiBoolSetting { protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { if(args.length == 0) throw new Error(" [bar name]"); switch(args[0]) { - case "hideAll" -> getAppliance().hideAll(getPlayer()); - case "show" -> getAppliance().show(getPlayer(), args[1]); - case "hide" -> getAppliance().hide(getPlayer(), args[1]); + case "hideAll" -> this.getAppliance().hideAll(this.getPlayer()); + case "show" -> this.getAppliance().show(this.getPlayer(), args[1]); + case "hide" -> this.getAppliance().hide(this.getPlayer(), args[1]); default -> throw new Error("Erlaubte Optionen sind 'show', 'hide', 'hideAll'!"); } } @@ -27,6 +27,6 @@ public class InfoBarCommand extends ApplianceCommand.PlayerChecked { @Override public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { if(args.length == 1) return List.of("show", "hide", "hideAll"); - return getAppliance().getInfoBars().stream().map(Bar::name).toList(); + return this.getAppliance().getInfoBars().stream().map(Bar::name).toList(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java index 5e08c60..7efeafd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java @@ -51,32 +51,33 @@ public class InfoBars extends Appliance { private List getStoredBars(Player player) { PersistentDataContainer container = player.getPersistentDataContainer(); - if(!container.has(infoBarKey)) return List.of(); - return container.get(infoBarKey, PersistentDataType.LIST.strings()); + if(!container.has(this.infoBarKey)) return List.of(); + return container.get(this.infoBarKey, PersistentDataType.LIST.strings()); } private void setStoredBars(Player player, List bars) { - player.getPersistentDataContainer().set(infoBarKey, PersistentDataType.LIST.strings(), bars); + player.getPersistentDataContainer().set(this.infoBarKey, PersistentDataType.LIST.strings(), bars); } private Bar getBarByName(String name) { - return infoBars.stream() + return this.infoBars.stream() .filter(bar -> bar.name().equalsIgnoreCase(name)) .findFirst() .orElse(null); } private void validateBarName(String name) { - if(getBarByName(name) == null) throw new ApplianceCommand.Error(String.format("Ungültiger infobar name '%s'", name)); + if(this.getBarByName(name) == null) + throw new ApplianceCommand.Error(String.format("Ungültiger infobar name '%s'", name)); } public List getInfoBars() { - return infoBars; + return this.infoBars; } @Override public void onDisable() { - infoBars.forEach(Bar::stopUpdate); + this.infoBars.forEach(Bar::stopUpdate); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java index fa5006a..6bec0a8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java @@ -7,6 +7,6 @@ import org.bukkit.event.player.PlayerJoinEvent; public class ShowPreviousBarsListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().showAll(event.getPlayer()); + this.getAppliance().showAll(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java index 36a46f4..c65cb7e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java @@ -19,7 +19,7 @@ public class KickCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().kick( + this.getAppliance().kick( args[0], Arrays.stream(args).skip(1).collect(Collectors.joining(" ")) ); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java index 5769d2c..d80c1fa 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java @@ -25,7 +25,7 @@ public class KnockDoor extends Appliance { if(setting.is(KnockDoorSetting.disabled)) return; if(setting.is(KnockDoorSetting.knockSingleTime)) { - playSound(knockedBlock); + this.playSound(knockedBlock); } if(setting.is(KnockDoorSetting.knockThreeTimes)) { @@ -39,10 +39,10 @@ public class KnockDoor extends Appliance { int timesKnocked = knockingPlayer.getMetadata(metadataKey).getFirst().asInt(); if(timesKnocked >= 3) { knockingPlayer.removeMetadata(metadataKey, Main.instance()); - cancel(); + this.cancel(); return; } - playSound(knockedBlock); + KnockDoor.this.playSound(knockedBlock); knockingPlayer.setMetadata(metadataKey, new FixedMetadataValue(Main.instance(), timesKnocked + 1)); } }.runTaskTimer(Main.instance(), 0, 8); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java index 2c37cbe..a42ba56 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java @@ -13,6 +13,6 @@ public class KnockDoorListener extends ApplianceListener { if(event.getPlayer().getGameMode() != GameMode.SURVIVAL) return; Block block = event.getBlock(); if(!(block.getBlockData() instanceof Door)) return; - getAppliance().knockAtDoor(event.getPlayer(), block); + this.getAppliance().knockAtDoor(event.getPlayer(), block); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java index 26ad7af..0471023 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java @@ -18,17 +18,17 @@ public class Maintenance extends Appliance { @Override public void onEnable() { - this.isInMaintenance = localConfig().getBoolean(configKey, false); + this.isInMaintenance = this.localConfig().getBoolean(this.configKey, false); } public void setState(boolean enabled) { this.isInMaintenance = enabled; - localConfig().set(configKey, enabled); + this.localConfig().set(this.configKey, enabled); Configuration.saveChanges(); } public boolean isInMaintenance() { - return isInMaintenance; + return this.isInMaintenance; } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java index 38ad1d9..8d2e556 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java @@ -20,18 +20,18 @@ public class MaintenanceCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - if(args.length == 1 && arguments.containsKey(args[0])) { - getAppliance().setState(arguments.get(args[0])); + if(args.length == 1 && this.arguments.containsKey(args[0])) { + this.getAppliance().setState(this.arguments.get(args[0])); sender.sendMessage(Component.text("Maintanance mode updated!", NamedTextColor.GREEN)); } sender.sendMessage(Component.text( - String.format("Maintanance mode is %b", getAppliance().isInMaintenance()), + String.format("Maintanance mode is %b", this.getAppliance().isInMaintenance()), NamedTextColor.GOLD )); } @Override public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - return arguments.keySet().stream().toList(); + return this.arguments.keySet().stream().toList(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java index aacc3bd..6ecad38 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java @@ -8,7 +8,7 @@ import org.bukkit.event.player.PlayerLoginEvent; public class PreventMaintenanceJoinListener extends ApplianceListener { @EventHandler public void onJoin(PlayerLoginEvent event) { - if(!getAppliance().isInMaintenance()) return; + if(!this.getAppliance().isInMaintenance()) return; if(event.getPlayer().hasPermission("bypassMaintainance")) return; DisconnectInfo disconnectInfo = new DisconnectInfo( diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java index d92c198..51f1152 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java @@ -17,10 +17,17 @@ import java.util.logging.Level; @SuppressWarnings("UnstableApiUsage") public class OptionLinks extends Appliance { - record ComponentSupplier() {} - record UriSupplier(Player player) {} - record UriConsumer(String uri) {} - record SuppliedLink(Function component, Function uri) {} + record ComponentSupplier() { + } + + record UriSupplier(Player player) { + } + + record UriConsumer(String uri) { + } + + record SuppliedLink(Function component, Function uri) { + } List links = List.of( new SuppliedLink( @@ -41,19 +48,19 @@ public class OptionLinks extends Appliance { public void setServerLinks(Player player) { ServerLinks playerLinks = Bukkit.getServerLinks().copy(); - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.links.forEach(suppliedLink -> { - Component component = suppliedLink.component.apply(new ComponentSupplier()); - String uri = suppliedLink.uri.apply(new UriSupplier(player)).uri; + Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { + this.links.forEach(suppliedLink -> { + Component component = suppliedLink.component.apply(new ComponentSupplier()); + String uri = suppliedLink.uri.apply(new UriSupplier(player)).uri; - try { - playerLinks.addLink(component, URI.create(uri)); - } catch(IllegalArgumentException e) { - Main.logger().log(Level.INFO, String.format("Failed to create OptionLink '%s' for player '%s'", uri, player.getName()), e); - } - }); - player.sendLinks(playerLinks); - }); + try { + playerLinks.addLink(component, URI.create(uri)); + } catch(IllegalArgumentException e) { + Main.logger().log(Level.INFO, String.format("Failed to create OptionLink '%s' for player '%s'", uri, player.getName()), e); + } + }); + player.sendLinks(playerLinks); + }); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java index 388de99..64abc44 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java @@ -7,6 +7,6 @@ import org.bukkit.event.player.PlayerJoinEvent; public class UpdateLinksListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { - getAppliance().setServerLinks(event.getPlayer()); + this.getAppliance().setServerLinks(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java index c8e5d6a..40d9bb4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java @@ -34,11 +34,11 @@ public class Outlawed extends Appliance implements DisplayName.Prefixed { super("outlawed"); Bukkit.getScheduler().runTaskTimerAsynchronously( Main.instance(), - () -> playerStatusMap.forEach((player, status) -> { + () -> this.playerStatusMap.forEach((player, status) -> { if(!player.isOnline()) return; if(status != Status.FORCED) return; try { - queryAppliance(Whitelist.class).integrityCheck(player); + this.queryAppliance(Whitelist.class).integrityCheck(player); } catch(DisconnectInfo.Throwable e) { Bukkit.getScheduler().runTask(Main.instance(), () -> e.getDisconnectScreen().applyKick(player)); } @@ -49,55 +49,55 @@ public class Outlawed extends Appliance implements DisplayName.Prefixed { } public void switchLawStatus(Player player) throws OutlawChangeNotPermitted { - if(getLawStatus(player).equals(Status.FORCED)) { + if(this.getLawStatus(player).equals(Status.FORCED)) { throw new OutlawChangeNotPermitted("Dein Vogelfreistatus wurde als Strafe auferlegt und kann daher nicht verändert werden."); } - if(isTimeout(player)) { + if(this.isTimeout(player)) { throw new OutlawChangeNotPermitted("Du kannst deinen Vogelfreistatus nicht so schnell wechseln. Bitte warte einige Stunden bevor du umschaltest!"); } - setLawStatus(player, isOutlawed(player) ? Status.DISABLED : Status.VOLUNTARILY); - setTimeout(player); + this.setLawStatus(player, this.isOutlawed(player) ? Status.DISABLED : Status.VOLUNTARILY); + this.setTimeout(player); } public void updateForcedStatus(Player player, boolean forced) { - setLawStatus(player, forced ? Status.FORCED : getLawStatus(player) == Status.FORCED ? Status.DISABLED : getLawStatus(player)); + this.setLawStatus(player, forced ? Status.FORCED : this.getLawStatus(player) == Status.FORCED ? Status.DISABLED : this.getLawStatus(player)); } public Status getLawStatus(Player player) { - return playerStatusMap.computeIfAbsent(player, p -> { - if(localConfig().getStringList(voluntarilyEntry).contains(p.getUniqueId().toString())) + return this.playerStatusMap.computeIfAbsent(player, p -> { + if(this.localConfig().getStringList(this.voluntarilyEntry).contains(p.getUniqueId().toString())) return Status.VOLUNTARILY; return Status.DISABLED; }); } private void setLawStatus(Player player, Status status) { - playerStatusMap.put(player, status); - queryAppliance(DisplayName.class).update(player); + this.playerStatusMap.put(player, status); + this.queryAppliance(DisplayName.class).update(player); - List newList = localConfig().getStringList(voluntarilyEntry); + List newList = this.localConfig().getStringList(this.voluntarilyEntry); if(status.equals(Status.VOLUNTARILY)) { newList.add(player.getUniqueId().toString()); } else { newList.remove(player.getUniqueId().toString()); } - localConfig().set(voluntarilyEntry, newList.stream().distinct().toList()); + this.localConfig().set(this.voluntarilyEntry, newList.stream().distinct().toList()); Configuration.saveChanges(); } public boolean isOutlawed(Player player) { - return getLawStatus(player) != Status.DISABLED; + return this.getLawStatus(player) != Status.DISABLED; } private boolean isTimeout(Player player) { - return timeouts.getOrDefault(player.getUniqueId(), 0L) > System.currentTimeMillis() - timeoutInMs; + return this.timeouts.getOrDefault(player.getUniqueId(), 0L) > System.currentTimeMillis() - this.timeoutInMs; } private void setTimeout(Player player) { - timeouts.put(player.getUniqueId(), System.currentTimeMillis()); + this.timeouts.put(player.getUniqueId(), System.currentTimeMillis()); } public Component getStatusDescription(Status status) { @@ -112,7 +112,7 @@ public class Outlawed extends Appliance implements DisplayName.Prefixed { @Override public Component getNamePrefix(Player player) { - if(isOutlawed(player)) { + if(this.isOutlawed(player)) { return Component.text("[☠]", NamedTextColor.RED) .hoverEvent(HoverEvent.showText(Component.text("Vogelfreie Spieler dürfen ohne Grund angegriffen werden!"))); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java index b469c33..30cd049 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java @@ -15,10 +15,10 @@ public class OutlawedCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { try { - getAppliance().switchLawStatus(getPlayer()); + this.getAppliance().switchLawStatus(this.getPlayer()); sender.sendMessage( - getAppliance() - .getStatusDescription(getAppliance().getLawStatus(getPlayer())) + this.getAppliance() + .getStatusDescription(this.getAppliance().getLawStatus(this.getPlayer())) ); } catch(OutlawChangeNotPermitted e) { sender.sendMessage(Component.text(e.getMessage(), NamedTextColor.RED)); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java index f5d522e..5d6d481 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java @@ -7,8 +7,8 @@ import org.bukkit.event.player.PlayerJoinEvent; public class OutlawedReminderListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent e) { - if(getAppliance().isOutlawed(e.getPlayer())) { - e.getPlayer().sendMessage(getAppliance().getStatusDescription(getAppliance().getLawStatus(e.getPlayer()))); + if(this.getAppliance().isOutlawed(e.getPlayer())) { + e.getPlayer().sendMessage(this.getAppliance().getStatusDescription(this.getAppliance().getLawStatus(e.getPlayer()))); } } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java index 12172d0..933a71a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java @@ -7,12 +7,13 @@ import org.jetbrains.annotations.NotNull; public class ChangePackCommand extends ApplianceCommand.PlayerChecked { public static final String commandName = "texturepack"; + public ChangePackCommand() { super(commandName); } @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().openPackInventory(getPlayer()); + this.getAppliance().openPackInventory(this.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java index 43bbfb2..1f82742 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java @@ -1,6 +1,7 @@ package eu.mhsl.craftattack.spawn.appliances.packSelect; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import eu.mhsl.craftattack.spawn.appliance.CachedApplianceSupplier; import eu.mhsl.craftattack.spawn.util.inventory.HeadBuilder; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; @@ -17,15 +18,15 @@ import java.util.stream.Collectors; public class PackConfiguration extends CachedApplianceSupplier { public record Pack(UUID id, String name, String description, String author, ResourcePackInfo info, String icon) { public ItemStack buildItem() { - ItemStack stack = HeadBuilder.getCustomTextureHead(icon); + ItemStack stack = HeadBuilder.getCustomTextureHead(this.icon); ItemMeta meta = stack.getItemMeta(); - meta.itemName(Component.text(id.toString())); - meta.displayName(Component.text(name(), NamedTextColor.GOLD)); + meta.itemName(Component.text(this.id.toString())); + meta.displayName(Component.text(this.name(), NamedTextColor.GOLD)); List lore = new ArrayList<>(); - lore.add(Component.text("Autor: ", NamedTextColor.DARK_GRAY).append(Component.text(author))); + lore.add(Component.text("Autor: ", NamedTextColor.DARK_GRAY).append(Component.text(this.author))); lore.add(Component.text(" ")); lore.addAll( - ComponentUtil.lineBreak(description()) + ComponentUtil.lineBreak(this.description()) .map(s -> Component.text(s, NamedTextColor.GRAY)) .toList() ); @@ -38,20 +39,23 @@ public class PackConfiguration extends CachedApplianceSupplier { public boolean equalsItem(ItemStack other) { String itemName = PlainTextComponentSerializer.plainText().serialize(other.getItemMeta().itemName()); try { - return UUID.fromString(itemName).equals(id); + return UUID.fromString(itemName).equals(this.id); } catch(IllegalArgumentException ignored) { return false; } } } + public record PackList(List packs) { public Optional findFromItem(ItemStack itemStack) { - return packs.stream() + return this.packs.stream() .filter(pack -> pack.equalsItem(itemStack)) .findFirst(); } } - public record SerializedPackList(List packs) {} + + public record SerializedPackList(List packs) { + } private final PackList packList; private final Gson gson = new GsonBuilder().create(); @@ -61,9 +65,9 @@ public class PackConfiguration extends CachedApplianceSupplier { } private PackConfiguration(String data) { - SerializedPackList serializedData = gson.fromJson(data, SerializedPackList.class); + SerializedPackList serializedData = this.gson.fromJson(data, SerializedPackList.class); - var availablePackMap = getAppliance().availablePacks.packs().stream() + var availablePackMap = this.getAppliance().availablePacks.packs().stream() .collect(Collectors.toMap(PackConfiguration.Pack::id, pack -> pack)); this.packList = new PackList( @@ -73,7 +77,8 @@ public class PackConfiguration extends CachedApplianceSupplier { .collect(Collectors.toList()) ); - if (this.packList.packs().isEmpty()) throw new IllegalArgumentException("Serialized data does not contain any valid data!"); + if(this.packList.packs().isEmpty()) + throw new IllegalArgumentException("Serialized data does not contain any valid data!"); } public static PackConfiguration deserialize(String data) { @@ -85,10 +90,10 @@ public class PackConfiguration extends CachedApplianceSupplier { } public String serialize() { - return gson.toJson(new SerializedPackList(this.packList.packs().stream().map(Pack::id).toList())); + return this.gson.toJson(new SerializedPackList(this.packList.packs().stream().map(Pack::id).toList())); } public List getPackList() { - return packList.packs(); + return this.packList.packs(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java index c1647a6..686967e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java @@ -34,8 +34,8 @@ public class PackConfigurationInventory extends CachedApplianceSupplier= 9 && slot < 9 * 4) { - getAppliance().availablePacks.findFromItem(clickedItem) + this.getAppliance().availablePacks.findFromItem(clickedItem) .ifPresent(this::toggle); } if(slot >= 9 * 5) { - getAppliance().availablePacks.findFromItem(clickedItem) + this.getAppliance().availablePacks.findFromItem(clickedItem) .ifPresent(pack -> { switch(clickType) { - case RIGHT -> move(pack, true); - case LEFT -> move(pack, false); - case MIDDLE -> toggle(pack); + case RIGHT -> this.move(pack, true); + case LEFT -> this.move(pack, false); + case MIDDLE -> this.toggle(pack); } }); } } private void move(PackConfiguration.Pack pack, boolean moveToRight) { - List packs = packConfiguration.getPackList(); + List packs = this.packConfiguration.getPackList(); int index = packs.indexOf(pack); - if (index != -1) { + if(index != -1) { int newIndex = moveToRight ? index + 1 : index - 1; - if (newIndex >= 0 && newIndex < packs.size()) Collections.swap(packs, index, newIndex); + if(newIndex >= 0 && newIndex < packs.size()) Collections.swap(packs, index, newIndex); } - InteractSounds.of(inventoryOwner).click(); - draw(); + InteractSounds.of(this.inventoryOwner).click(); + this.draw(); } private void toggle(PackConfiguration.Pack pack) { - if(packConfiguration.getPackList().contains(pack)) { - packConfiguration.getPackList().remove(pack); + if(this.packConfiguration.getPackList().contains(pack)) { + this.packConfiguration.getPackList().remove(pack); } else { - packConfiguration.getPackList().add(pack); + this.packConfiguration.getPackList().add(pack); } - InteractSounds.of(inventoryOwner).click(); - draw(); + InteractSounds.of(this.inventoryOwner).click(); + this.draw(); } private void reset() { - packConfiguration.getPackList().clear(); - InteractSounds.of(inventoryOwner).delete(); - draw(); + this.packConfiguration.getPackList().clear(); + InteractSounds.of(this.inventoryOwner).delete(); + this.draw(); } private void apply() { - inventoryOwner.closeInventory(); - InteractSounds.of(inventoryOwner).success(); - Bukkit.getScheduler().runTask(Main.instance(), () -> getAppliance().setPack(inventoryOwner, packConfiguration)); + this.inventoryOwner.closeInventory(); + InteractSounds.of(this.inventoryOwner).success(); + Bukkit.getScheduler().runTask(Main.instance(), () -> this.getAppliance().setPack(this.inventoryOwner, this.packConfiguration)); } private void draw() { - inventory.clear(); + this.inventory.clear(); - inventory.setItem(0, packConfiguration.getPackList().isEmpty() ? PlaceholderItems.grayStainedGlassPane : reset); - IteratorUtil.times(3, () -> inventory.addItem(PlaceholderItems.grayStainedGlassPane)); - inventory.setItem(4, info); - IteratorUtil.times(3, () -> inventory.addItem(PlaceholderItems.grayStainedGlassPane)); - inventory.setItem(8, save); + this.inventory.setItem(0, this.packConfiguration.getPackList().isEmpty() ? PlaceholderItems.grayStainedGlassPane : this.reset); + IteratorUtil.times(3, () -> this.inventory.addItem(PlaceholderItems.grayStainedGlassPane)); + this.inventory.setItem(4, this.info); + IteratorUtil.times(3, () -> this.inventory.addItem(PlaceholderItems.grayStainedGlassPane)); + this.inventory.setItem(8, this.save); IteratorUtil.iterateListInGlobal( 9, - getAppliance().availablePacks.packs().stream() - .filter(pack -> !packConfiguration.getPackList().contains(pack)) + this.getAppliance().availablePacks.packs().stream() + .filter(pack -> !this.packConfiguration.getPackList().contains(pack)) .limit(9 * 3) .map(pack -> { ItemBuilder stack = ItemBuilder.of(pack.buildItem()); - if(packConfiguration.getPackList().contains(pack)) stack.glint(); + if(this.packConfiguration.getPackList().contains(pack)) stack.glint(); return stack.build(); }) .toList(), - inventory::setItem + this.inventory::setItem ); IntStream.range(9 * 4, 9 * 5) - .forEach(slot -> inventory.setItem(slot, PlaceholderItems.grayStainedGlassPane)); + .forEach(slot -> this.inventory.setItem(slot, PlaceholderItems.grayStainedGlassPane)); IteratorUtil.iterateListInGlobal( 9 * 5, IteratorUtil.expandList( - IntStream.range(0, Math.min(packConfiguration.getPackList().size(), 9)) + IntStream.range(0, Math.min(this.packConfiguration.getPackList().size(), 9)) .mapToObj(i -> { - PackConfiguration.Pack pack = packConfiguration.getPackList().get(i); + PackConfiguration.Pack pack = this.packConfiguration.getPackList().get(i); ItemBuilder builder = ItemBuilder.of(pack.buildItem()); builder @@ -162,9 +162,9 @@ public class PackConfigurationInventory extends CachedApplianceSupplier> packs = localConfig().getMapList("packs"); + List> packs = this.localConfig().getMapList("packs"); Bukkit.getScheduler().runTaskAsynchronously( Main.instance(), () -> packs.stream() @@ -58,8 +58,8 @@ public class PackSelect extends Appliance { resourcePackInfo, packData.get("icon") ); - availablePacks.packs().add(packToAdd); - } catch (Exception e) { + this.availablePacks.packs().add(packToAdd); + } catch(Exception e) { Main.logger().warning(String.format("Failed to add pack %s: %s", packData.get("name"), e.getMessage())); } }) @@ -78,9 +78,9 @@ public class PackSelect extends Appliance { } public void openPackInventory(Player player) { - PackConfigurationInventory packInventory = new PackConfigurationInventory(getPackConfigurationForPlayer(player), player); + PackConfigurationInventory packInventory = new PackConfigurationInventory(this.getPackConfigurationForPlayer(player), player); player.openInventory(packInventory.getInventory()); - openInventories.put(player, packInventory); + this.openInventories.put(player, packInventory); } public void setPack(Player player, PackConfiguration packConfiguration) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java index 8409155..826dc4e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java @@ -19,7 +19,7 @@ public class ResourcePackInfoFactory { } public static @NotNull CompletableFuture createResourcePackInfo(@NotNull URI resourcePackUrl, @Nullable String hash) { - if (isValidHash(hash)) { + if(isValidHash(hash)) { return CompletableFuture.completedFuture( ResourcePackInfo.resourcePackInfo(UUID.nameUUIDFromBytes(hash.getBytes()), resourcePackUrl, hash) ); @@ -32,11 +32,11 @@ public class ResourcePackInfoFactory { connection.setRequestMethod("GET"); connection.connect(); - try (InputStream inputStream = connection.getInputStream()) { + try(InputStream inputStream = connection.getInputStream()) { MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1"); byte[] buffer = new byte[1024]; int bytesRead; - while ((bytesRead = inputStream.read(buffer)) != -1) { + while((bytesRead = inputStream.read(buffer)) != -1) { sha1Digest.update(buffer, 0, bytesRead); } String sha1Hex = bytesToHex(sha1Digest.digest()); @@ -44,7 +44,7 @@ public class ResourcePackInfoFactory { Main.logger().info(String.format("Calculating SHA1 Hash of %s completed: %s", resourcePackUrl, sha1Hex)); return ResourcePackInfo.resourcePackInfo(UUID.nameUUIDFromBytes(sha1Hex.getBytes()), resourcePackUrl, sha1Hex); } - } catch (Exception e) { + } catch(Exception e) { String error = String.format("Error whilst SHA1 calculation of %s: %s", resourcePackUrl, e.getMessage()); Main.logger().warning(error); throw new RuntimeException(error); @@ -54,7 +54,7 @@ public class ResourcePackInfoFactory { private static String bytesToHex(byte[] bytes) { StringBuilder hexString = new StringBuilder(bytes.length * 2); - for (byte b : bytes) { + for(byte b : bytes) { hexString.append(String.format("%02x", b)); } return hexString.toString(); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java index 3156961..3f8b582 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java @@ -10,10 +10,10 @@ public class ClickPackInventoryListener extends ApplianceListener { @EventHandler public void interact(InventoryClickEvent event) { if(!(event.getWhoClicked() instanceof Player player)) return; - if(getAppliance().isNotPackInventory(player, event.getInventory())) return; + if(this.getAppliance().isNotPackInventory(player, event.getInventory())) return; event.setCancelled(true); - getAppliance().openInventories.get(player).handleClick( + this.getAppliance().openInventories.get(player).handleClick( event.getCurrentItem(), event.getSlot(), event.getClick() diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java index b64cb88..bac488e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java @@ -10,7 +10,7 @@ public class ClosePackInventoryListener extends ApplianceListener { @EventHandler public void onClose(InventoryCloseEvent event) { if(!(event.getPlayer() instanceof Player player)) return; - if(getAppliance().isNotPackInventory(player, event.getInventory())) return; - getAppliance().openInventories.remove(player); + if(this.getAppliance().isNotPackInventory(player, event.getInventory())) return; + this.getAppliance().openInventories.remove(player); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java index 85e5d54..2472750 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java @@ -12,7 +12,7 @@ public class SetPacksOnJoinListener extends ApplianceListener { public void onJoin(PlayerJoinEvent event) { Bukkit.getScheduler().runTask( Main.instance(), - () -> getAppliance().setPack(event.getPlayer(), getAppliance().getPackConfigurationForPlayer(event.getPlayer())) + () -> this.getAppliance().setPack(event.getPlayer(), this.getAppliance().getPackConfigurationForPlayer(event.getPlayer())) ); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java index fef73a8..9365184 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java @@ -22,15 +22,15 @@ public class PanicBan extends Appliance { if(player == null) throw new ApplianceCommand.Error("Player not found"); - panicBans.put(player.getUniqueId(), System.currentTimeMillis()); + this.panicBans.put(player.getUniqueId(), System.currentTimeMillis()); this.getDisconnectInfo(player.getUniqueId()).applyKick(player); } public boolean isBanned(UUID player) { - if(panicBans.containsKey(player) && panicBans.get(player) < System.currentTimeMillis() - 15 * 60 * 1000) - panicBans.remove(player); + if(this.panicBans.containsKey(player) && this.panicBans.get(player) < System.currentTimeMillis() - 15 * 60 * 1000) + this.panicBans.remove(player); - return panicBans.containsKey(player); + return this.panicBans.containsKey(player); } public DisconnectInfo getDisconnectInfo(UUID playerUuid) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java index 0931efa..a31e58c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java @@ -20,7 +20,7 @@ public class PanicBanCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().panicBan(args[0]); + this.getAppliance().panicBan(args[0]); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java index fa4dc2f..a1533de 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java @@ -7,8 +7,8 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent; public class PanicBanJoinListener extends ApplianceListener { @EventHandler public void onLogin(AsyncPlayerPreLoginEvent event) { - if(getAppliance().isBanned(event.getUniqueId())) { - event.kickMessage(getAppliance().getDisconnectInfo(event.getUniqueId()).getComponent()); + if(this.getAppliance().isBanned(event.getUniqueId())) { + event.kickMessage(this.getAppliance().getDisconnectInfo(event.getUniqueId()).getComponent()); event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_BANNED); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java index 4f620b3..9686cf4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java @@ -15,18 +15,18 @@ public class PlayerLimit extends Appliance { public PlayerLimit() { super("playerLimit"); - this.limit = localConfig().getInt(playerLimitKey); + this.limit = this.localConfig().getInt(playerLimitKey); Bukkit.setMaxPlayers(Integer.MAX_VALUE); } public void setPlayerLimit(int limit) { this.limit = limit; - localConfig().set(playerLimitKey, limit); + this.localConfig().set(playerLimitKey, limit); Configuration.saveChanges(); } public int getLimit() { - return limit; + return this.limit; } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java index a43b002..13247f3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java @@ -18,7 +18,7 @@ public class PlayerLimiterListener extends ApplianceListener { ).getComponent() ); - if(Bukkit.getOnlinePlayers().size() >= getAppliance().getLimit()) + if(Bukkit.getOnlinePlayers().size() >= this.getAppliance().getLimit()) playerPreLoginEvent.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_FULL); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java index 09ab400..46caee8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java @@ -18,11 +18,11 @@ public class SetPlayerLimitCommand extends ApplianceCommand { sender.sendMessage( Component.text() .append(Component.text("Das aktuelle Spielerlimit beträgt: ", NamedTextColor.GRAY)) - .append(Component.text(getAppliance().getLimit(), NamedTextColor.GOLD)) + .append(Component.text(this.getAppliance().getLimit(), NamedTextColor.GOLD)) ); return; } - getAppliance().setPlayerLimit(Integer.parseInt(args[0])); + this.getAppliance().setPlayerLimit(Integer.parseInt(args[0])); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java index 03cffc7..031cedb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java @@ -17,15 +17,15 @@ public class PlaytimeCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - String playerName = args.length == 1 ? args[0] : getPlayer().getName(); + String playerName = args.length == 1 ? args[0] : this.getPlayer().getName(); Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { OfflinePlayer player = Bukkit.getOfflinePlayer(playerName); - if (!player.hasPlayedBefore()) { + if(!player.hasPlayedBefore()) { sender.sendMessage(Component.text("Der Spieler existiert nicht!", NamedTextColor.RED)); return; } - sender.sendMessage(getAppliance().getFormattedPlaytime(player)); + sender.sendMessage(this.getAppliance().getFormattedPlaytime(player)); }); } } \ No newline at end of file diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java index d100a9b..15b932b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java @@ -11,6 +11,6 @@ public class OnCraftingTableUseListener extends ApplianceListener> replyMapping = new WeakHashMap<>(); public void reply(Player sender, String message) { @@ -32,7 +34,7 @@ public class PrivateMessage extends Appliance { List replyList = this.replyMapping.get(sender); List tooOldConversations = replyList.stream() - .filter(conversation -> conversation.lastSet < System.currentTimeMillis() - (conversationTimeoutMinutes*60*1000)) + .filter(conversation -> conversation.lastSet < System.currentTimeMillis() - (this.conversationTimeoutMinutes * 60 * 1000)) .toList(); replyList.removeAll(tooOldConversations); @@ -60,12 +62,13 @@ public class PrivateMessage extends Appliance { } List oldConversations = replyList.stream() - .filter(conversation -> conversation.lastSet < System.currentTimeMillis() - (targetChangeTimeoutSeconds*1000)) + .filter(conversation -> conversation.lastSet < System.currentTimeMillis() - (this.targetChangeTimeoutSeconds * 1000)) .toList(); if(oldConversations.contains(youngestEntry) || replyList.size() == 1) { Player target = Bukkit.getPlayer(youngestEntry.target()); - if(target == null) throw new ApplianceCommand.Error("Der Spieler " + Bukkit.getOfflinePlayer(youngestEntry.target()).getName() + " ist nicht mehr verfügbar."); + if(target == null) + throw new ApplianceCommand.Error("Der Spieler " + Bukkit.getOfflinePlayer(youngestEntry.target()).getName() + " ist nicht mehr verfügbar."); replyList.clear(); this.sendWhisper(sender, new ResolvedPmUserArguments(target, message)); @@ -98,11 +101,11 @@ public class PrivateMessage extends Appliance { .toList(); playerNames.forEach(playerName -> component.append( - Component.text("[") - .append(Component.text(playerName, NamedTextColor.GOLD)) - .append(Component.text("]")) - .clickEvent(ClickEvent.runCommand(String.format("/msg %s %s", playerName, message))) - .hoverEvent(HoverEvent.showText(Component.text("Klicke, um diesem Spieler zu schreiben.").color(NamedTextColor.GOLD)))) + Component.text("[") + .append(Component.text(playerName, NamedTextColor.GOLD)) + .append(Component.text("]")) + .clickEvent(ClickEvent.runCommand(String.format("/msg %s %s", playerName, message))) + .hoverEvent(HoverEvent.showText(Component.text("Klicke, um diesem Spieler zu schreiben.").color(NamedTextColor.GOLD)))) .append(Component.text(" ")) ); component.appendNewline(); @@ -167,12 +170,16 @@ public class PrivateMessage extends Appliance { ); } - public record ResolvedPmUserArguments(Player receiver, String message) {} + public record ResolvedPmUserArguments(Player receiver, String message) { + } + public ResolvedPmUserArguments resolveImplicit(String[] args) { - if(args.length < 2) throw new ApplianceCommand.Error("Es muss ein Spieler sowie eine Nachricht angegeben werden."); + if(args.length < 2) + throw new ApplianceCommand.Error("Es muss ein Spieler sowie eine Nachricht angegeben werden."); List arguments = List.of(args); Player targetPlayer = Bukkit.getPlayer(arguments.getFirst()); - if(targetPlayer == null) throw new ApplianceCommand.Error(String.format("Der Spieler %s konnte nicht gefunden werden.", arguments.getFirst())); + if(targetPlayer == null) + throw new ApplianceCommand.Error(String.format("Der Spieler %s konnte nicht gefunden werden.", arguments.getFirst())); String message = arguments.stream().skip(1).collect(Collectors.joining(" ")); return new ResolvedPmUserArguments(targetPlayer, message); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java index 711bbe3..958f64d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java @@ -13,6 +13,6 @@ public class PrivateMessageCommand extends ApplianceCommand.PlayerChecked netherFireLocations = List.of( - new Location(startWorld, -211, 68, -354), - new Location(startWorld, -209, 68, -356), - new Location(startWorld, -207, 68, -354), - new Location(startWorld, -209, 68, -352) + new Location(this.startWorld, -211, 68, -354), + new Location(this.startWorld, -209, 68, -356), + new Location(this.startWorld, -207, 68, -354), + new Location(this.startWorld, -209, 68, -352) ); private final Countdown countdown = new Countdown( - localConfig().getInt("countdown"), + this.localConfig().getInt("countdown"), this::format, this::announce, this::startProject ); private final BlockCycle blockCycle = new BlockCycle( - glassLocation, + this.glassLocation, Material.ORANGE_STAINED_GLASS, List.of( Material.RED_STAINED_GLASS, @@ -78,10 +78,10 @@ public class ProjectStart extends Appliance { this.countdown.addCustomAnnouncement( new Countdown.CustomAnnouncements( - counter -> counter == startMusicAt, - counter -> glassLocation + counter -> counter == this.startMusicAt, + counter -> this.glassLocation .getWorld() - .playSound(glassLocation, MUSIC_DISC_PIGSTEP, SoundCategory.RECORDS, 500f, 1f) + .playSound(this.glassLocation, MUSIC_DISC_PIGSTEP, SoundCategory.RECORDS, 500f, 1f) ) ); } @@ -96,12 +96,12 @@ public class ProjectStart extends Appliance { } private void announce(Component message) { - blockCycle.next(); + this.blockCycle.next(); IteratorUtil.onlinePlayers(player -> player.sendMessage(message)); } public void startCountdown() { - if(!isEnabled()) return; + if(!this.isEnabled()) return; this.countdown.start(); } @@ -111,13 +111,13 @@ public class ProjectStart extends Appliance { } public void startProject() { - setEnabled(false); + this.setEnabled(false); IteratorUtil.worlds(World::getWorldBorder, worldBorder -> worldBorder.setSize(worldBorder.getMaxSize())); - IteratorUtil.worlds(world -> IteratorUtil.setGameRules(gameRulesAfterStart, false)); + IteratorUtil.worlds(world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, false)); IteratorUtil.worlds(world -> world.setFullTime(0)); - netherFireLocations.forEach(location -> Objects.requireNonNull(startWorld).getBlockAt(location).setType(Material.FIRE)); + this.netherFireLocations.forEach(location -> Objects.requireNonNull(this.startWorld).getBlockAt(location).setType(Material.FIRE)); Bukkit.getOnlinePlayers().forEach(player -> { player.setFoodLevel(20); @@ -144,40 +144,40 @@ public class ProjectStart extends Appliance { ); Bukkit.getOnlinePlayers().forEach( - player -> Main.instance().getAppliance(CustomAdvancements.class).grantAdvancement(Advancements.start, player.getUniqueId()) + player -> Main.instance().getAppliance(CustomAdvancements.class).grantAdvancement(Advancements.start, player.getUniqueId()) ); - blockCycle.reset(); + this.blockCycle.reset(); } public void restoreBeforeStart() { - setEnabled(true); + this.setEnabled(true); IteratorUtil.onlinePlayers(Player::stopAllSounds); IteratorUtil.worlds(World::getWorldBorder, worldBorder -> { - worldBorder.setSize(localConfig().getLong("worldborder-before")); + worldBorder.setSize(this.localConfig().getLong("worldborder-before")); worldBorder.setWarningDistance(0); worldBorder.setDamageAmount(0); }); - IteratorUtil.worlds(world -> world, world -> IteratorUtil.setGameRules(gameRulesAfterStart, true)); + IteratorUtil.worlds(world -> world, world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, true)); - blockCycle.reset(); + this.blockCycle.reset(); } public boolean isEnabled() { - return localConfig().getBoolean("enabled"); + return this.localConfig().getBoolean("enabled"); } public void setEnabled(boolean enabled) { - localConfig().set("enabled", enabled); + this.localConfig().set("enabled", enabled); Configuration.saveChanges(); } public Countdown getCountdown() { - return countdown; + return this.countdown; } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java index d099612..589b286 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java @@ -15,8 +15,8 @@ public class ProjectStartCancelCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if(getAppliance().getCountdown().isRunning()) { - getAppliance().cancelCountdown(); + if(this.getAppliance().getCountdown().isRunning()) { + this.getAppliance().cancelCountdown(); sender.sendMessage(Component.text("Countdown cancelled successfully!").color(NamedTextColor.GREEN)); } else { sender.sendMessage(Component.text("Countdown is not running!").color(NamedTextColor.RED)); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java index 507bea5..cca5ebd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java @@ -15,16 +15,16 @@ public class ProjectStartCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if(!getAppliance().isEnabled()) { + if(!this.getAppliance().isEnabled()) { sender.sendMessage(Component.text("Countdown not enabled or executed once before!").color(NamedTextColor.RED)); return; } - if(getAppliance().getCountdown().isRunning()) { + if(this.getAppliance().getCountdown().isRunning()) { sender.sendMessage(Component.text("Countdown already running!").color(NamedTextColor.RED)); return; } - getAppliance().startCountdown(); + this.getAppliance().startCountdown(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java index 8110d44..56e7f8b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java @@ -13,6 +13,6 @@ public class ProjectStartResetCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - getAppliance().restoreBeforeStart(); + this.getAppliance().restoreBeforeStart(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java index 559fd89..181c151 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java @@ -10,7 +10,7 @@ import org.bukkit.event.player.PlayerAdvancementDoneEvent; public class NoAdvancementsListener extends ApplianceListener { @EventHandler public void onAdvancement(PlayerAdvancementDoneEvent event) { - if(!getAppliance().isEnabled()) return; + if(!this.getAppliance().isEnabled()) return; event.message(null); Advancement advancement = event.getAdvancement(); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java index 89e116f..674705d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java @@ -12,16 +12,16 @@ public class PlayerInvincibleListener extends ApplianceListener { @EventHandler public void onDamage(EntityDamageEvent event) { if(!(event.getEntity() instanceof Player)) return; - if(getAppliance().isEnabled()) event.setCancelled(true); + if(this.getAppliance().isEnabled()) event.setCancelled(true); } @EventHandler public void onHunger(FoodLevelChangeEvent event) { - if(getAppliance().isEnabled()) event.setCancelled(true); + if(this.getAppliance().isEnabled()) event.setCancelled(true); } @EventHandler public void onHit(PrePlayerAttackEntityEvent event) { - if(getAppliance().isEnabled()) event.setCancelled(true); + if(this.getAppliance().isEnabled()) event.setCancelled(true); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java index 0a196cf..569a2a5 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java @@ -26,15 +26,15 @@ public class ReportCommand extends ApplianceCommand.PlayerChecked { sender.sendMessage(ComponentUtil.pleaseWait()); if(args.length == 0) { - getAppliance().reportToUnknown(getPlayer()); + this.getAppliance().reportToUnknown(this.getPlayer()); } if(args.length == 1) { - getAppliance().reportToKnown(getPlayer(), args[0], null); + this.getAppliance().reportToKnown(this.getPlayer(), args[0], null); } if(args.length > 1) { - getAppliance().reportToKnown(getPlayer(), args[0], Arrays.stream(args).skip(1).collect(Collectors.joining(" "))); + this.getAppliance().reportToKnown(this.getPlayer(), args[0], Arrays.stream(args).skip(1).collect(Collectors.joining(" "))); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java index 88d5dea..7106c09 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java @@ -14,6 +14,6 @@ public class ReportsCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { sender.sendMessage(ComponentUtil.pleaseWait()); - getAppliance().queryReports(getPlayer()); + this.getAppliance().queryReports(this.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java index 9cc6039..3be4343 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java @@ -13,6 +13,6 @@ public class CancelRestartCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().cancelRestart(); + this.getAppliance().cancelRestart(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java index f86b7c7..41e40b3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java @@ -13,6 +13,6 @@ public class ScheduleRestartCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().scheduleRestart(); + this.getAppliance().scheduleRestart(); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java index 409d333..831203a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java @@ -58,20 +58,20 @@ public class Settings extends Appliance { private final WeakHashMap>> settingsCache = new WeakHashMap<>(); private List> getSettings(Player player) { - if(settingsCache.containsKey(player)) return settingsCache.get(player); + if(this.settingsCache.containsKey(player)) return this.settingsCache.get(player); List> settings = this.declaredSettings.stream() .map(clazz -> { try { return clazz.getDeclaredConstructor(); - } catch (NoSuchMethodException e) { + } catch(NoSuchMethodException e) { throw new RuntimeException(String.format("Setting '%s' does not have an accessible constructor", clazz.getName()), e); } }) .map(constructor -> { try { return constructor.newInstance(); - } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) { + } catch(InstantiationException | IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(String.format("Failed to create instance of setting '%s'", constructor.getDeclaringClass().getName()), e); } }) @@ -83,7 +83,7 @@ public class Settings extends Appliance { } public T getSetting(Player player, Key key, Class clazz) { - Setting setting = getSettings(player).stream() + Setting setting = this.getSettings(player).stream() .filter(s -> Objects.equals(s.getKey(), key)) .findFirst() .orElseThrow(); @@ -96,8 +96,8 @@ public class Settings extends Appliance { } public void openSettings(Player player) { - List> settings = getSettings(player); - Inventory inventory = Bukkit.createInventory(null, calculateInvSize(settings), Component.text("Einstellungen")); + List> settings = this.getSettings(player); + Inventory inventory = Bukkit.createInventory(null, this.calculateInvSize(settings), Component.text("Einstellungen")); AtomicInteger row = new AtomicInteger(0); Arrays.stream(SettingCategory.values()) @@ -107,11 +107,11 @@ public class Settings extends Appliance { .filter(setting -> ((CategorizedSetting) setting).category().equals(category)) .toList(); - for (int i = 0; i < categorizedSettings.size(); i++) { + for(int i = 0; i < categorizedSettings.size(); i++) { int slot = row.get() * 9 + i % 9; inventory.setItem(slot, categorizedSettings.get(i).buildItem()); - if (i % 9 == 8) { + if(i % 9 == 8) { row.incrementAndGet(); } } @@ -122,11 +122,11 @@ public class Settings extends Appliance { .filter(setting -> !(setting instanceof CategorizedSetting)) .toList(); - for (int i = 0; i < uncategorizedSettings.size(); i++) { + for(int i = 0; i < uncategorizedSettings.size(); i++) { int slot = row.get() * 9 + i % 9; inventory.setItem(slot, uncategorizedSettings.get(i).buildItem()); - if (i % 9 == 8) { + if(i % 9 == 8) { row.incrementAndGet(); } } @@ -153,8 +153,8 @@ public class Settings extends Appliance { } public void onSettingsClose(Player player) { - if(!openSettingsInventories.containsKey(player)) return; - openSettingsInventories.remove(player); + if(!this.openSettingsInventories.containsKey(player)) return; + this.openSettingsInventories.remove(player); player.updateInventory(); } @@ -163,7 +163,8 @@ public class Settings extends Appliance { } public OpenSettingsInventory getOpenInventory(Player player) { - if(hasSettingsNotOpen(player)) throw new RuntimeException("Cannot retrieve data from closed Settings inventory!"); + if(this.hasSettingsNotOpen(player)) + throw new RuntimeException("Cannot retrieve data from closed Settings inventory!"); return this.openSettingsInventories.get(player); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java index 4ba335f..102eba0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java @@ -12,6 +12,6 @@ public class SettingsCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - getAppliance().openSettings(getPlayer()); + this.getAppliance().openSettings(this.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java index 59e2071..7209f9c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java @@ -17,14 +17,14 @@ public abstract class ActionSetting extends Setting { @Override public ItemMeta buildMeta(ItemMeta meta) { - meta.displayName(Component.text(title(), NamedTextColor.WHITE)); - meta.lore(buildDescription(description())); + meta.displayName(Component.text(this.title(), NamedTextColor.WHITE)); + meta.lore(this.buildDescription(this.description())); return meta; } @Override protected void change(Player player, ClickType clickType) { - onAction(player, clickType); + this.onAction(player, clickType); } @Override @@ -33,10 +33,12 @@ public abstract class ActionSetting extends Setting { } @Override - protected void fromStorage(PersistentDataContainer container) {} + protected void fromStorage(PersistentDataContainer container) { + } @Override - protected void toStorage(PersistentDataContainer container, Void value) {} + protected void toStorage(PersistentDataContainer container, Void value) { + } @Override public Class dataType() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java index 12ccbb5..d258ece 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java @@ -20,19 +20,19 @@ public abstract class BoolSetting extends Setting { @Override public void fromStorage(PersistentDataContainer container) { - this.state = container.has(getNamespacedKey()) - ? Objects.requireNonNull(container.get(getNamespacedKey(), PersistentDataType.BOOLEAN)) - : defaultValue(); + this.state = container.has(this.getNamespacedKey()) + ? Objects.requireNonNull(container.get(this.getNamespacedKey(), PersistentDataType.BOOLEAN)) + : this.defaultValue(); } @Override protected void toStorage(PersistentDataContainer container, Boolean value) { - container.set(getNamespacedKey(), PersistentDataType.BOOLEAN, value); + container.set(this.getNamespacedKey(), PersistentDataType.BOOLEAN, value); } @Override public ItemMeta buildMeta(ItemMeta meta) { - meta.displayName(Component.text(title(), NamedTextColor.WHITE)); + meta.displayName(Component.text(this.title(), NamedTextColor.WHITE)); List lore = new ArrayList<>(List.of( Component.empty() .append(Component.text("Status: ", NamedTextColor.DARK_GRAY)) @@ -42,7 +42,7 @@ public abstract class BoolSetting extends Setting { ), Component.empty() )); - lore.addAll(buildDescription(description())); + lore.addAll(this.buildDescription(this.description())); meta.lore(lore); return meta; } @@ -59,6 +59,6 @@ public abstract class BoolSetting extends Setting { @Override public Boolean state() { - return state; + return this.state; } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java index 7055030..0067b8b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java @@ -35,9 +35,10 @@ public abstract class MultiBoolSetting extends Setting { @Override public ItemMeta buildMeta(ItemMeta meta) { - record SettingField(String name, String displayName, Boolean value) {} + record SettingField(String name, String displayName, Boolean value) { + } - meta.displayName(Component.text(title(), NamedTextColor.WHITE)); + meta.displayName(Component.text(this.title(), NamedTextColor.WHITE)); List lore = new ArrayList<>(); lore.add(Component.text("Status: ", NamedTextColor.DARK_GRAY)); @@ -54,12 +55,12 @@ public abstract class MultiBoolSetting extends Setting { : component.getName(); return new SettingField(component.getName(), displayName, value); - } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + } catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { throw new RuntimeException(e); } }) .map(field -> { - if (cursorPosition == null) cursorPosition = field.name; + if(this.cursorPosition == null) this.cursorPosition = field.name; boolean isSelected = field.name.equals(this.cursorPosition); return Component.text() .append(Component.text( @@ -79,7 +80,7 @@ public abstract class MultiBoolSetting extends Setting { .toList() ); lore.add(Component.empty()); - lore.addAll(buildDescription(description())); + lore.addAll(this.buildDescription(this.description())); lore.add(Component.empty()); lore.add(Component.text("Linksklick", NamedTextColor.AQUA).append(Component.text(" zum Wählen der Option", NamedTextColor.GRAY))); lore.add(Component.text("Rechtsklick", NamedTextColor.AQUA).append(Component.text(" zum Ändern des Wertes", NamedTextColor.GRAY))); @@ -96,16 +97,16 @@ public abstract class MultiBoolSetting extends Setting { .findFirst() .orElse(-1); - if (clickType.equals(ClickType.LEFT)) { + if(clickType.equals(ClickType.LEFT)) { currentIndex = (currentIndex + 1) % recordComponents.length; this.cursorPosition = recordComponents[currentIndex].getName(); - } else if (clickType.equals(ClickType.RIGHT)) { + } else if(clickType.equals(ClickType.RIGHT)) { try { Object[] values = Arrays.stream(recordComponents) .map(rc -> { try { return this.state.getClass().getDeclaredMethod(rc.getName()).invoke(this.state); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(e); } }) @@ -119,7 +120,8 @@ public abstract class MultiBoolSetting extends Setting { this.state = (T) this.state.getClass().getConstructor( Arrays.stream(recordComponents).map(RecordComponent::getType).toArray(Class[]::new) ).newInstance(values); - } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) { + } catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException | + InstantiationException e) { throw new RuntimeException(e); } } @@ -127,21 +129,21 @@ public abstract class MultiBoolSetting extends Setting { @Override protected void fromStorage(PersistentDataContainer container) { - String data = container.has(getNamespacedKey()) - ? Objects.requireNonNull(container.get(getNamespacedKey(), PersistentDataType.STRING)) - : new Gson().toJson(defaultValue()); + String data = container.has(this.getNamespacedKey()) + ? Objects.requireNonNull(container.get(this.getNamespacedKey(), PersistentDataType.STRING)) + : new Gson().toJson(this.defaultValue()); try { //noinspection unchecked - this.state = (T) new Gson().fromJson(data, dataType()); + this.state = (T) new Gson().fromJson(data, this.dataType()); } catch(Exception e) { - this.state = defaultValue(); + this.state = this.defaultValue(); } } @Override protected void toStorage(PersistentDataContainer container, T value) { - container.set(getNamespacedKey(), PersistentDataType.STRING, new Gson().toJson(value)); + container.set(this.getNamespacedKey(), PersistentDataType.STRING, new Gson().toJson(value)); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java index c00c5b6..a03c3c4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java @@ -37,7 +37,7 @@ public abstract class SelectSetting extends Setting lore = new ArrayList<>(); lore.add(Component.text("Status: ", NamedTextColor.DARK_GRAY)); lore.addAll( @@ -52,7 +52,7 @@ public abstract class SelectSetting extends Setting options.get(i).equals(this.state)) .mapToObj(i -> { int nextIndex = i + optionModifier; - if (nextIndex >= options.size()) { + if(nextIndex >= options.size()) { return options.getFirst(); - } else if (nextIndex < 0) { + } else if(nextIndex < 0) { return options.getLast(); } else { return options.get(nextIndex); @@ -79,19 +79,19 @@ public abstract class SelectSetting extends Setting option.key.asString().equals(data)) .findFirst() - .orElse(defaultValue()); + .orElse(this.defaultValue()); } @Override protected void toStorage(PersistentDataContainer container, Options.Option value) { - container.set(getNamespacedKey(), PersistentDataType.STRING, value.key.asString()); + container.set(this.getNamespacedKey(), PersistentDataType.STRING, value.key.asString()); } @Override diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java index 0fc5580..0d9c064 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java @@ -25,25 +25,25 @@ public abstract class Setting { } public NamespacedKey getNamespacedKey() { - return new NamespacedKey(Main.instance(), key.name()); + return new NamespacedKey(Main.instance(), this.key.name()); } public Settings.Key getKey() { - return key; + return this.key; } public void initializeFromPlayer(Player p) { - fromStorage(p.getPersistentDataContainer()); + this.fromStorage(p.getPersistentDataContainer()); } public void triggerChange(Player p, ClickType clickType) { this.change(p, clickType); - toStorage(p.getPersistentDataContainer(), this.state()); + this.toStorage(p.getPersistentDataContainer(), this.state()); } public ItemStack buildItem() { - ItemStack stack = new ItemStack(icon(), 1); - stack.setItemMeta(buildMeta(stack.getItemMeta())); + ItemStack stack = new ItemStack(this.icon(), 1); + stack.setItemMeta(this.buildMeta(stack.getItemMeta())); return stack; } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java index af609b9..0732fc2 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java @@ -9,8 +9,9 @@ public class OpenSettingsShortcutListener extends ApplianceListener { @EventHandler public void onItemSwitch(PlayerSwapHandItemsEvent event) { if(!event.getPlayer().isSneaking()) return; - if(!Settings.instance().getSetting(event.getPlayer(), Settings.Key.EnableSettingsShortcut, Boolean.class)) return; + if(!Settings.instance().getSetting(event.getPlayer(), Settings.Key.EnableSettingsShortcut, Boolean.class)) + return; event.setCancelled(true); - getAppliance().openSettings(event.getPlayer()); + this.getAppliance().openSettings(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java index ca7abef..8be442b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java @@ -11,10 +11,10 @@ public class SettingsInventoryListener extends ApplianceListener { @EventHandler public void onInventoryClick(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if(getAppliance().hasSettingsNotOpen(player)) return; + if(this.getAppliance().hasSettingsNotOpen(player)) return; event.setCancelled(true); - Settings.OpenSettingsInventory openInventory = getAppliance().getOpenInventory(player); + Settings.OpenSettingsInventory openInventory = this.getAppliance().getOpenInventory(player); openInventory.settings().stream() .filter(setting -> setting.buildItem().equals(event.getCurrentItem())) .findFirst() @@ -26,6 +26,6 @@ public class SettingsInventoryListener extends ApplianceListener { @EventHandler public void onInventoryClose(InventoryCloseEvent event) { - getAppliance().onSettingsClose((Player) event.getPlayer()); + this.getAppliance().onSettingsClose((Player) event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java index 4179307..1f148b8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java @@ -9,11 +9,11 @@ public class SleepStateChangeListener extends ApplianceListener { @EventHandler public void onBedEnter(PlayerBedEnterEvent event) { if(!event.getBedEnterResult().equals(PlayerBedEnterEvent.BedEnterResult.OK)) return; - getAppliance().updateSleeping(event.getPlayer(), true); + this.getAppliance().updateSleeping(event.getPlayer(), true); } @EventHandler public void onBedLeave(PlayerBedLeaveEvent event) { - getAppliance().updateSleeping(event.getPlayer(), false); + this.getAppliance().updateSleeping(event.getPlayer(), false); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java index 30a4849..1e2a201 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java @@ -1,7 +1,9 @@ package eu.mhsl.craftattack.spawn.appliances.snowballKnockback; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import org.bukkit.entity.*; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.ProjectileHitEvent; @@ -13,6 +15,6 @@ public class SnowballKnockbackListener extends ApplianceListener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - getAppliance().fullUpdate(event.getPlayer()); + this.getAppliance().fullUpdate(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java index 81996ab..47d61d0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java @@ -7,6 +7,6 @@ import org.bukkit.event.player.PlayerJoinEvent; public class TitleClearListener extends ApplianceListener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - getAppliance().clearTitle(event.getPlayer()); + this.getAppliance().clearTitle(event.getPlayer()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java index d69b8b5..f084330 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java @@ -9,7 +9,7 @@ public class PlayerJoinListener extends ApplianceListener { @EventHandler public void preLoginEvent(PlayerLoginEvent preLoginEvent) { try { - getAppliance().integrityCheck(preLoginEvent.getPlayer()); + this.getAppliance().integrityCheck(preLoginEvent.getPlayer()); } catch(DisconnectInfo.Throwable e) { preLoginEvent.disallow( PlayerLoginEvent.Result.KICK_WHITELIST, diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java index 97d9b3c..3e4f5c7 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java @@ -31,39 +31,39 @@ public class Whitelist extends Appliance { public void integrityCheck(Player player) throws DisconnectInfo.Throwable { try { Main.instance().getLogger().info(String.format("Running integrityCheck for %s", player.getName())); - boolean overrideCheck = localConfig().getBoolean("overrideIntegrityCheck", false); + boolean overrideCheck = this.localConfig().getBoolean("overrideIntegrityCheck", false); WhitelistRepository.UserData user = overrideCheck - ? new WhitelistRepository.UserData(player.getUniqueId(), player.getName(), "", "", 0L, 0L) - : this.fetchUserData(player.getUniqueId()); + ? new WhitelistRepository.UserData(player.getUniqueId(), player.getName(), "", "", 0L, 0L) + : this.fetchUserData(player.getUniqueId()); - if (timestampRelevant(user.banned_until())) { + if(this.timestampRelevant(user.banned_until())) { Instant bannedDate = new Date(user.banned_until() * 1000L) - .toInstant() - .plus(1, ChronoUnit.HOURS); + .toInstant() + .plus(1, ChronoUnit.HOURS); DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("dd.MM.yyyy").withZone(ZoneOffset.UTC); DateTimeFormatter timeFormat = DateTimeFormatter.ofPattern("HH:mm").withZone(ZoneOffset.UTC); throw new DisconnectInfo.Throwable( - "Du wurdest vom Server gebannt.", - String.format("Dein Bann läuft am %s um %s ab!", dateFormat.format(bannedDate), timeFormat.format(bannedDate)), - "Wende dich an einen Admin für weitere Informationen.", - player.getUniqueId() + "Du wurdest vom Server gebannt.", + String.format("Dein Bann läuft am %s um %s ab!", dateFormat.format(bannedDate), timeFormat.format(bannedDate)), + "Wende dich an einen Admin für weitere Informationen.", + player.getUniqueId() ); } - queryAppliance(Outlawed.class).updateForcedStatus(player, timestampRelevant(user.outlawed_until())); + this.queryAppliance(Outlawed.class).updateForcedStatus(player, this.timestampRelevant(user.outlawed_until())); String purePlayerName = Floodgate.isBedrock(player) - ? Floodgate.getBedrockPlayer(player).getUsername() - : player.getName(); + ? Floodgate.getBedrockPlayer(player).getUsername() + : player.getName(); - if (!user.username().trim().equalsIgnoreCase(purePlayerName)) + if(!user.username().trim().equalsIgnoreCase(purePlayerName)) throw new DisconnectInfo.Throwable( - "Nutzername geändert", - String.format("Der Name '%s' stimmt nicht mit '%s' überein.", user.username(), player.getName()), - "Bitte kontaktiere einen Admin, um Deine Anmeldedaten zu aktualisieren!", - player.getUniqueId() + "Nutzername geändert", + String.format("Der Name '%s' stimmt nicht mit '%s' überein.", user.username(), player.getName()), + "Bitte kontaktiere einen Admin, um Deine Anmeldedaten zu aktualisieren!", + player.getUniqueId() ); } catch(DisconnectInfo.Throwable e) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java index 952fbd3..c3b5f9d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java @@ -12,6 +12,6 @@ public class MoveWorldMuseumVillagerCommand extends ApplianceCommand.PlayerCheck @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - getAppliance().updateVillagerPosition(getPlayer().getLocation()); + this.getAppliance().updateVillagerPosition(this.getPlayer().getLocation()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java index 0520a48..4914950 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java @@ -29,7 +29,7 @@ public class WorldMuseum extends Appliance { @Override public void onEnable() { this.villager = new DisplayVillager.ConfigBound( - localConfig(), + this.localConfig(), villager -> { villager.customName(Component.text("Museum der Welten").color(NamedTextColor.GOLD)); villager.setProfession(Villager.Profession.CARTOGRAPHER); @@ -55,7 +55,7 @@ public class WorldMuseum extends Appliance { } Main.logger().info("Sending" + player.getName() + " to WorldMuseum"); - PluginMessage.connect(player, localConfig().getString("connect-server-name")); + PluginMessage.connect(player, this.localConfig().getString("connect-server-name")); } @Override @@ -68,7 +68,7 @@ public class WorldMuseum extends Appliance { @NotNull protected List listeners() { return List.of( - new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> handleVillagerInteraction(playerInteractAtEntityEvent.getPlayer())), + new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> this.handleVillagerInteraction(playerInteractAtEntityEvent.getPlayer())), new DismissInventoryOpenFromHolder(this.villager.getUniqueId()) ); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java index f66b349..de5e215 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java @@ -17,7 +17,9 @@ import java.io.File; import java.util.*; public class YearRank extends Appliance implements DisplayName.Prefixed { - record CraftAttackYear(String name) {} + record CraftAttackYear(String name) { + } + private final Map> rankMap = new HashMap<>(); @Override @@ -40,15 +42,15 @@ public class YearRank extends Appliance implements DisplayName.Prefixed { .map(file -> file.getName().split("\\.")[0]) .distinct() .map(UUID::fromString) - .peek(uuid -> rankMap.computeIfAbsent(uuid, p -> new ArrayList<>())) - .forEach(uuid -> rankMap.get(uuid).add(craftAttackYear)); + .peek(uuid -> this.rankMap.computeIfAbsent(uuid, p -> new ArrayList<>())) + .forEach(uuid -> this.rankMap.get(uuid).add(craftAttackYear)); }); } @Override public @Nullable Component getNamePrefix(Player player) { - if(!rankMap.containsKey(player.getUniqueId())) return null; - int yearCount = rankMap.get(player.getUniqueId()).size(); + if(!this.rankMap.containsKey(player.getUniqueId())) return null; + int yearCount = this.rankMap.get(player.getUniqueId()).size(); if(yearCount <= 3) return null; return Component.text() @@ -62,8 +64,8 @@ public class YearRank extends Appliance implements DisplayName.Prefixed { public Component listYearRanks() { TextComponent.Builder builder = Component.text(); builder.append(Component.text("Top 30 Spieler: ", NamedTextColor.GOLD)); - rankMap.keySet().stream() - .map(uuid -> Map.entry(uuid, rankMap.get(uuid).size())) + this.rankMap.keySet().stream() + .map(uuid -> Map.entry(uuid, this.rankMap.get(uuid).size())) .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())) .limit(30) .forEach(entry -> builder @@ -79,7 +81,7 @@ public class YearRank extends Appliance implements DisplayName.Prefixed { .appendNewline() .append(Component.text("Übersischt:", NamedTextColor.GOLD)); - rankMap.values().stream() + this.rankMap.values().stream() .mapMulti(Iterable::forEach) .filter(o -> o instanceof CraftAttackYear) .map(o -> (CraftAttackYear) o) @@ -88,8 +90,8 @@ public class YearRank extends Appliance implements DisplayName.Prefixed { .appendNewline() .append(Component.text(craftAttackYear.name, NamedTextColor.GRAY)) .append(Component.text(": ")) - .append(Component.text(rankMap.keySet().stream() - .filter(uuid -> rankMap.get(uuid).contains(craftAttackYear)).count()))); + .append(Component.text(this.rankMap.keySet().stream() + .filter(uuid -> this.rankMap.get(uuid).contains(craftAttackYear)).count()))); return builder.build(); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java index b879b04..8c70ab9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java @@ -12,6 +12,6 @@ public class YearRankCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - sender.sendMessage(getAppliance().listYearRanks()); + sender.sendMessage(this.getAppliance().listYearRanks()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/entity/DisplayVillager.java b/src/main/java/eu/mhsl/craftattack/spawn/util/entity/DisplayVillager.java index 5259145..f3bfc2e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/entity/DisplayVillager.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/entity/DisplayVillager.java @@ -24,7 +24,7 @@ public class DisplayVillager { this.villager = (Villager) this.location.getWorld().getEntity(uuid); Objects.requireNonNull(this.villager); } catch(NullPointerException | IllegalArgumentException e) { - this.villager = getBaseVillager(); + this.villager = this.getBaseVillager(); villagerCreator.accept(this.villager); } @@ -32,7 +32,7 @@ public class DisplayVillager { } public Villager getVillager() { - return villager; + return this.villager; } private Villager getBaseVillager() { @@ -79,11 +79,11 @@ public class DisplayVillager { } public Villager getVillager() { - return villager.getVillager(); + return this.villager.getVillager(); } public UUID getUniqueId() { - return getVillager().getUniqueId(); + return this.getVillager().getUniqueId(); } } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/inventory/ItemBuilder.java b/src/main/java/eu/mhsl/craftattack/spawn/util/inventory/ItemBuilder.java index a516c21..abcbed8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/inventory/ItemBuilder.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/inventory/ItemBuilder.java @@ -40,7 +40,7 @@ public class ItemBuilder { } public ItemBuilder displayName(Function process) { - return this.displayName(process.apply(itemStack.displayName())); + return this.displayName(process.apply(this.itemStack.displayName())); } public ItemBuilder lore(String text) { @@ -60,7 +60,7 @@ public class ItemBuilder { } public ItemBuilder appendLore(Component text) { - List lore = itemStack.lore(); + List lore = this.itemStack.lore(); Objects.requireNonNull(lore, "Cannot append lore to Item without lore"); lore.add(text); return this.withMeta(itemMeta -> itemMeta.lore(lore)); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/statistics/NetworkMonitor.java b/src/main/java/eu/mhsl/craftattack/spawn/util/statistics/NetworkMonitor.java index 88719e2..5ad276f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/statistics/NetworkMonitor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/statistics/NetworkMonitor.java @@ -45,11 +45,11 @@ public class NetworkMonitor { } public Traffic getTraffic() { - return new Traffic(rxBytesLastDuration, txBytesLastDuration); + return new Traffic(this.rxBytesLastDuration, this.txBytesLastDuration); } public Packets getPackets() { - return new Packets(rxPacketsLastDuration, txPacketsLastDuration); + return new Packets(this.rxPacketsLastDuration, this.txPacketsLastDuration); } public void stop() { @@ -57,15 +57,15 @@ public class NetworkMonitor { } private void update() { - long rxBytes = getNetworkStatistic("rx_bytes"); - long txBytes = getNetworkStatistic("tx_bytes"); - long rxPackets = getNetworkStatistic("rx_packets"); - long txPackets = getNetworkStatistic("tx_packets"); + long rxBytes = this.getNetworkStatistic("rx_bytes"); + long txBytes = this.getNetworkStatistic("tx_bytes"); + long rxPackets = this.getNetworkStatistic("rx_packets"); + long txPackets = this.getNetworkStatistic("tx_packets"); - this.rxBytesLastDuration = rxBytes - previousRxBytes; - this.txBytesLastDuration = txBytes - previousTxBytes; - this.rxPacketsLastDuration = rxPackets - previousRxPackets; - this.txPacketsLastDuration = txPackets - previousTxPackets; + this.rxBytesLastDuration = rxBytes - this.previousRxBytes; + this.txBytesLastDuration = txBytes - this.previousTxBytes; + this.rxPacketsLastDuration = rxPackets - this.previousRxPackets; + this.txPacketsLastDuration = txPackets - this.previousTxPackets; this.previousRxBytes = rxBytes; this.previousTxBytes = txBytes; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java index c2bb5e6..aa1cbdc 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java @@ -37,6 +37,7 @@ public class ComponentUtil { public static Stream lineBreak(String text) { return lineBreak(text, 50); } + public static Stream lineBreak(String text, int charactersPerLine) { List lines = new ArrayList<>(); String[] words = text.split(" "); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/Countdown.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/Countdown.java index 4daff70..3f7f685 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/Countdown.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/Countdown.java @@ -35,12 +35,12 @@ public class Countdown { this.onDone = onDone; this.defaultAnnouncements = count -> { - if(current > 60 && current % 60 == 0) { - return new AnnouncementData(current / 60, "Minuten"); + if(this.current > 60 && this.current % 60 == 0) { + return new AnnouncementData(this.current / 60, "Minuten"); } - if(current <= 60 && (current <= 10 || current % 10 == 0)) { - return new AnnouncementData(current, "Sekunden"); + if(this.current <= 60 && (this.current <= 10 || this.current % 10 == 0)) { + return new AnnouncementData(this.current, "Sekunden"); } return null; @@ -66,34 +66,34 @@ public class Countdown { this.running = false; Bukkit.getScheduler().cancelTask(this.taskId); this.taskId = 0; - this.current = countdownFrom; + this.current = this.countdownFrom; } public void cancelIfRunning() { - if(this.running) cancel(); + if(this.running) this.cancel(); } private void tick() { - AnnouncementData defaultAnnouncementData = this.defaultAnnouncements.apply(current); + AnnouncementData defaultAnnouncementData = this.defaultAnnouncements.apply(this.current); if(defaultAnnouncementData != null) { this.announcementConsumer.accept(this.announcementBuilder.apply(defaultAnnouncementData)); } - customAnnouncements + this.customAnnouncements .stream() - .filter(a -> a.test.apply(current)) - .forEach(a -> a.task.accept(current)); + .filter(a -> a.test.apply(this.current)) + .forEach(a -> a.task.accept(this.current)); this.current--; - if(isDone()) { + if(this.isDone()) { this.onDone.run(); this.cancel(); } } public boolean isDone() { - return current <= 0; + return this.current <= 0; } public boolean isRunning() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java index 43a24a8..b273856 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java @@ -17,7 +17,7 @@ public class DataSizeConverter { int unitIndex = 0; double readableSize = bytes; - while (readableSize >= 1024 && unitIndex < units.length - 1) { + while(readableSize >= 1024 && unitIndex < units.length - 1) { readableSize /= 1024; unitIndex++; } @@ -26,7 +26,7 @@ public class DataSizeConverter { } public static String formatCpuTimeToHumanReadable(long nanoseconds) { - if (nanoseconds < 0) return "unsupported"; + if(nanoseconds < 0) return "unsupported"; long seconds = nanoseconds / 1_000_000_000; long minutes = seconds / 60; @@ -40,7 +40,7 @@ public class DataSizeConverter { } public static String formatSecondsToHumanReadable(int seconds) { - if (seconds < 0) return "unsupported"; + if(seconds < 0) return "unsupported"; int minutes = seconds / 60; int hours = minutes / 60; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/RainbowComponent.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/RainbowComponent.java index eb74d36..fc3a554 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/RainbowComponent.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/RainbowComponent.java @@ -20,14 +20,14 @@ public class RainbowComponent { public Component getRainbowState() { Component builder = Component.empty(); float hue = this.hueOffset; - for (char c : text.toCharArray()) { + for(char c : this.text.toCharArray()) { float normalizedHue = (hue % 360) / 360; TextColor color = TextColor.color(Color.getHSBColor(normalizedHue, 1, 1).getRGB()); builder = builder.append(Component.text(c).color(color)); - hue += density; + hue += this.density; } - this.hueOffset = (this.hueOffset + speed) % 360; + this.hueOffset = (this.hueOffset + this.speed) % 360; return builder; } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/world/BlockCycle.java b/src/main/java/eu/mhsl/craftattack/spawn/util/world/BlockCycle.java index 92b0699..5659299 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/world/BlockCycle.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/world/BlockCycle.java @@ -18,12 +18,12 @@ public class BlockCycle { } public void next() { - location.getBlock().setType(blockList.get(current)); - current++; - if(current >= blockList.size()) current = 0; + this.location.getBlock().setType(this.blockList.get(this.current)); + this.current++; + if(this.current >= this.blockList.size()) this.current = 0; } public void reset() { - location.getBlock().setType(defaultBlock); + this.location.getBlock().setType(this.defaultBlock); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/world/InteractSounds.java b/src/main/java/eu/mhsl/craftattack/spawn/util/world/InteractSounds.java index f03854b..d49c3c9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/world/InteractSounds.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/world/InteractSounds.java @@ -16,7 +16,7 @@ public class InteractSounds { } private void playSound(org.bukkit.Sound sound) { - player.playSound(getSound(sound.key()), Sound.Emitter.self()); + this.player.playSound(this.getSound(sound.key()), Sound.Emitter.self()); } private Sound getSound(Key soundKey) { @@ -24,14 +24,14 @@ public class InteractSounds { } public void click() { - playSound(org.bukkit.Sound.UI_BUTTON_CLICK); + this.playSound(org.bukkit.Sound.UI_BUTTON_CLICK); } public void success() { - playSound(org.bukkit.Sound.ENTITY_PLAYER_LEVELUP); + this.playSound(org.bukkit.Sound.ENTITY_PLAYER_LEVELUP); } public void delete() { - playSound(org.bukkit.Sound.ENTITY_SILVERFISH_DEATH); + this.playSound(org.bukkit.Sound.ENTITY_SILVERFISH_DEATH); } }