prototype for grief detection

# Conflicts:
#	src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/Spawnpoint.java

src/main/java/eu/mhsl/craftattack/spawn/Main.java

@@ -1,6 +1,7 @@
 package eu.mhsl.craftattack.spawn;
 
-import eu.mhsl.craftattack.spawn.api.HttpServer;
+import eu.mhsl.craftattack.spawn.api.client.RepositoryLoader;
+import eu.mhsl.craftattack.spawn.api.server.HttpServer;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.config.Configuration;
 import org.bukkit.Bukkit;
@@ -19,15 +20,16 @@ public final class Main extends JavaPlugin {
     private static Logger logger;
 
     private List<Appliance> appliances;
+    private RepositoryLoader repositoryLoader;
 
     @Override
     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();
         }
@@ -37,7 +39,11 @@ public final class Main extends JavaPlugin {
         Configuration.readConfig();
         List<String> disabledAppliances = Configuration.pluginConfig.getStringList("disabledAppliances");
 
-        Main.logger.info("Loading appliances...");
+        Main.logger().info("Loading Repositories...");
+        this.repositoryLoader = new RepositoryLoader();
+        Main.logger().info(String.format("Loaded %d repositories!", this.repositoryLoader.getRepositories().size()));
+
+        Main.logger().info("Loading appliances...");
         Reflections reflections = new Reflections(this.getClass().getPackageName());
         Set<Class<? extends Appliance>> applianceClasses = reflections.getSubTypesOf(Appliance.class);
 
@@ -46,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);
@@ -78,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 extends Appliance> T getAppliance(Class<T> clazz) {
@@ -95,7 +101,11 @@ public final class Main extends JavaPlugin {
     }
 
     public List<Appliance> getAppliances() {
-        return appliances;
+        return this.appliances;
+    }
+
+    public RepositoryLoader getRepositoryLoader() {
+        return this.repositoryLoader;
     }
 
     public static Main instance() {

src/main/java/eu/mhsl/craftattack/spawn/api/client/HttpRepository.java

@@ -0,0 +1,91 @@
+package eu.mhsl.craftattack.spawn.api.client;
+
+import eu.mhsl.craftattack.spawn.Main;
+import org.apache.http.client.utils.URIBuilder;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.function.Consumer;
+
+@RepositoryLoader.IgnoreRepository
+public abstract class HttpRepository extends Repository {
+    private final Consumer<URIBuilder> baseUriBuilder;
+
+    public HttpRepository(URI basePath) {
+        this(basePath, null);
+    }
+
+    public HttpRepository(URI basePath, @Nullable Consumer<URIBuilder> baseUriBuilder) {
+        super(basePath);
+
+        this.baseUriBuilder = baseUriBuilder == null
+            ? uriBuilder -> {
+        }
+            : baseUriBuilder;
+    }
+
+    protected <TInput, TOutput> ReqResp<TOutput> post(String command, TInput data, Class<TOutput> outputType) {
+        return this.post(command, parameters -> {
+        }, data, outputType);
+    }
+
+    protected <TInput, TOutput> ReqResp<TOutput> post(String command, Consumer<URIBuilder> parameters, TInput data, Class<TOutput> outputType) {
+        HttpRequest request = this.getRequestBuilder(this.getUri(command, parameters))
+            .POST(HttpRequest.BodyPublishers.ofString(this.gson.toJson(data)))
+            .build();
+
+        return this.execute(request, outputType);
+    }
+
+    protected <TOutput> ReqResp<TOutput> get(String command, Class<TOutput> outputType) {
+        return this.get(command, parameters -> {
+        }, outputType);
+    }
+
+    protected <TOutput> ReqResp<TOutput> get(String command, Consumer<URIBuilder> parameters, Class<TOutput> outputType) {
+        HttpRequest request = this.getRequestBuilder(this.getUri(command, parameters))
+            .GET()
+            .build();
+
+        return this.execute(request, outputType);
+    }
+
+    private URI getUri(String command, Consumer<URIBuilder> parameters) {
+        try {
+            URIBuilder builder = new URIBuilder(this.basePath + "/" + command);
+            this.baseUriBuilder.accept(builder);
+            parameters.accept(builder);
+            return builder.build();
+        } catch(URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private HttpRequest.Builder getRequestBuilder(URI endpoint) {
+        return HttpRequest.newBuilder()
+            .uri(endpoint)
+            .header("User-Agent", Main.instance().getServer().getBukkitVersion())
+            .header("Content-Type", "application/json");
+    }
+
+    private <TResponse> ReqResp<TResponse> execute(HttpRequest request, Class<TResponse> clazz) {
+        ReqResp<String> rawResponse = this.sendHttp(request);
+        return new ReqResp<>(rawResponse.status(), this.gson.fromJson(rawResponse.data(), clazz));
+    }
+
+    private ReqResp<String> sendHttp(HttpRequest request) {
+        try(HttpClient client = HttpClient.newHttpClient()) {
+            this.validateThread(request.uri().getPath());
+            HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
+            return new ReqResp<>(httpResponse.statusCode(), httpResponse.body());
+        } catch(IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/Repository.java

@@ -0,0 +1,27 @@
+package eu.mhsl.craftattack.spawn.api.client;
+
+import com.google.gson.Gson;
+import eu.mhsl.craftattack.spawn.Main;
+import org.bukkit.Bukkit;
+
+import java.net.URI;
+
+public abstract class Repository {
+    protected URI basePath;
+    protected Gson gson;
+
+    public Repository(URI basePath) {
+        this.basePath = basePath;
+        this.gson = new Gson();
+    }
+
+    protected void validateThread(String commandName) {
+        if(!Bukkit.isPrimaryThread()) return;
+
+        Main.logger().warning(String.format(
+            "Repository '%s' was called synchronously with command '%s'!",
+            this.getClass().getSimpleName(),
+            commandName
+        ));
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/RepositoryLoader.java

@@ -0,0 +1,48 @@
+package eu.mhsl.craftattack.spawn.api.client;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.reflections.Reflections;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Set;
+
+public class RepositoryLoader {
+    private final List<Repository> repositories;
+
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface IgnoreRepository {
+    }
+
+    public RepositoryLoader() {
+        Reflections reflections = new Reflections(this.getClass().getPackageName());
+        Set<Class<? extends Repository>> repositories = reflections.getSubTypesOf(Repository.class);
+
+        this.repositories = repositories.stream()
+            .filter(repository -> !repository.isAnnotationPresent(IgnoreRepository.class))
+            .map(repository -> {
+                try {
+                    return (Repository) repository.getDeclaredConstructor().newInstance();
+                } catch(InstantiationException | IllegalAccessException | InvocationTargetException |
+                        NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+            })
+            .toList();
+    }
+
+    public <T> T getRepository(Class<T> clazz) {
+        //noinspection unchecked
+        return this.repositories.stream()
+            .filter(clazz::isInstance)
+            .map(repository -> (T) repository)
+            .findFirst()
+            .orElseThrow(() -> new NotImplementedException(String.format("Repository '%s' not found!", clazz.getSimpleName())));
+    }
+
+    public List<Repository> getRepositories() {
+        return this.repositories;
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/ReqResp.java

@@ -0,0 +1,4 @@
+package eu.mhsl.craftattack.spawn.api.client;
+
+public record ReqResp<TData>(int status, TData data) {
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/EventRepository.java

@@ -0,0 +1,29 @@
+package eu.mhsl.craftattack.spawn.api.client.repositories;
+
+import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.EventApiUtil;
+
+import java.util.UUID;
+
+public class EventRepository extends HttpRepository {
+    public EventRepository() {
+        super(EventApiUtil.getBaseUri());
+    }
+
+    public record CreatedRoom(UUID uuid) {
+    }
+
+    public record QueueRoom(UUID player, UUID room) {
+        public record Response(String error) {
+        }
+    }
+
+    public ReqResp<CreatedRoom> createSession() {
+        return this.post("room", null, CreatedRoom.class);
+    }
+
+    public ReqResp<QueueRoom.Response> queueRoom(QueueRoom request) {
+        return this.post("queueRoom", request, QueueRoom.Response.class);
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/FeedbackRepository.java

@@ -0,0 +1,27 @@
+package eu.mhsl.craftattack.spawn.api.client.repositories;
+
+import com.google.common.reflect.TypeToken;
+import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class FeedbackRepository extends HttpRepository {
+    public FeedbackRepository() {
+        super(WebsiteApiUtil.getBaseUri(), WebsiteApiUtil::withAuthorizationSecret);
+    }
+
+    public record Request(String event, List<UUID> users) {
+    }
+
+    public ReqResp<Map<UUID, String>> createFeedbackUrls(Request data) {
+        final Type responseType = new TypeToken<Map<UUID, String>>() {
+        }.getType();
+        ReqResp<Object> rawData = this.post("feedback", data, Object.class);
+        return new ReqResp<>(rawData.status(), this.gson.fromJson(this.gson.toJson(rawData.data()), responseType));
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/ReportRepository.java

@@ -0,0 +1,57 @@
+package eu.mhsl.craftattack.spawn.api.client.repositories;
+
+import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.UUID;
+
+public class ReportRepository extends HttpRepository {
+    public ReportRepository() {
+        super(WebsiteApiUtil.getBaseUri(), WebsiteApiUtil::withAuthorizationSecret);
+    }
+
+    public record ReportCreationInfo(@NotNull UUID reporter, @Nullable UUID reported, String reason) {
+    }
+
+    public record ReportUrl(@NotNull String url) {
+    }
+
+    public record PlayerReports(
+        List<Report> from_self,
+        Object to_self
+    ) {
+        public record Report(
+            @Nullable Reporter reported,
+            @NotNull String subject,
+            boolean draft,
+            @NotNull String status,
+            @NotNull String url
+        ) {
+            public record Reporter(
+                @NotNull String username,
+                @NotNull String uuid
+            ) {
+            }
+        }
+    }
+
+    public ReqResp<PlayerReports> queryReports(UUID player) {
+        return this.get(
+            "report",
+            (parameters) -> parameters.addParameter("uuid", player.toString()),
+            PlayerReports.class
+        );
+    }
+
+    public ReqResp<ReportUrl> createReport(ReportCreationInfo data) {
+        return this.post(
+            "report",
+            data,
+            ReportUrl.class
+        );
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/client/repositories/WhitelistRepository.java

@@ -0,0 +1,31 @@
+package eu.mhsl.craftattack.spawn.api.client.repositories;
+
+import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+
+import java.util.UUID;
+
+public class WhitelistRepository extends HttpRepository {
+    public WhitelistRepository() {
+        super(WebsiteApiUtil.getBaseUri(), WebsiteApiUtil::withAuthorizationSecret);
+    }
+
+    public record UserData(
+        UUID uuid,
+        String username,
+        String firstname,
+        String lastname,
+        Long banned_until,
+        Long outlawed_until
+    ) {
+    }
+
+    public ReqResp<UserData> getUserData(UUID userId) {
+        return this.get(
+            "user",
+            parameters -> parameters.addParameter("uuid", userId.toString()),
+            UserData.class
+        );
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/api/server/HttpServer.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.api;
+package eu.mhsl.craftattack.spawn.api.server;
 
 import com.google.gson.Gson;
 import eu.mhsl.craftattack.spawn.Main;

src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java

@@ -1,7 +1,8 @@
 package eu.mhsl.craftattack.spawn.appliance;
 
 import eu.mhsl.craftattack.spawn.Main;
-import eu.mhsl.craftattack.spawn.api.HttpServer;
+import eu.mhsl.craftattack.spawn.api.client.Repository;
+import eu.mhsl.craftattack.spawn.api.server.HttpServer;
 import eu.mhsl.craftattack.spawn.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
@@ -72,8 +73,8 @@ public abstract class Appliance {
      */
     @NotNull
     public ConfigurationSection localConfig() {
-        return Optional.ofNullable(Configuration.cfg.getConfigurationSection(localConfigPath))
+        return Optional.ofNullable(Configuration.cfg.getConfigurationSection(this.localConfigPath))
-            .orElseGet(() -> Configuration.cfg.createSection(localConfigPath));
+            .orElseGet(() -> Configuration.cfg.createSection(this.localConfigPath));
     }
 
     public void onEnable() {
@@ -83,21 +84,25 @@ public abstract class Appliance {
     }
 
     public void initialize(@NotNull JavaPlugin plugin) {
-        this.listeners = listeners();
+        this.listeners = this.listeners();
-        this.commands = commands();
+        this.commands = this.commands();
 
-        listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin));
+        this.listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin));
-        commands.forEach(command -> setCommandExecutor(plugin, command.commandName, command));
+        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 static <T extends Appliance> T queryAppliance(Class<T> clazz) {
+    protected <T extends Appliance> T queryAppliance(Class<T> clazz) {
         return Main.instance().getAppliance(clazz);
     }
 
+    protected <T extends Repository> T queryRepository(Class<T> clazz) {
+        return Main.instance().getRepositoryLoader().getRepository(clazz);
+    }
+
     private void setCommandExecutor(JavaPlugin plugin, String name, ApplianceCommand<?> executor) {
         PluginCommand command = plugin.getCommand(name);
         if(command != null && executor != null) {
@@ -110,10 +115,10 @@ public abstract class Appliance {
     }
 
     public List<Listener> getListeners() {
-        return listeners;
+        return this.listeners;
     }
 
     public List<ApplianceCommand<?>> getCommands() {
-        return commands;
+        return this.commands;
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliance/ApplianceCommand.java

@@ -33,12 +33,12 @@ public abstract class ApplianceCommand<T extends Appliance> 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")));
+            sender.sendMessage(this.errorMessage.append(Component.text("Interner Fehler")));
-            Main.logger().warning("Error executing appliance command " + commandName + ": " + e.getMessage());
+            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<T extends Appliance> 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;

src/main/java/eu/mhsl/craftattack/spawn/appliance/CachedApplianceSupplier.java

@@ -6,7 +6,7 @@ public class CachedApplianceSupplier<T extends Appliance> 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

src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarkerListener.java

@@ -1,14 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.adminMarker;
-
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import net.kyori.adventure.text.format.TextColor;
-import org.bukkit.Color;
-import org.bukkit.entity.Player;
-
-public class AdminMarkerListener extends ApplianceListener<AdminMarker> {
-    private TextColor getPlayerColor(Player player) {
-        if(player.hasPermission("chatcolor"))
-            return TextColor.color(Color.AQUA.asRGB()); // TODO read permission from config
-        return TextColor.color(Color.WHITE.asRGB());
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java

@@ -1,13 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener;
-
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-public class ApplyPendingAdvancementsListener extends ApplianceListener<CustomAdvancements> {
-    @EventHandler
-    public void onJoin(PlayerJoinEvent event) {
-        getAppliance().applyPendingAdvancements(event.getPlayer());
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java

@@ -1,68 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.displayName;
-
-import eu.mhsl.craftattack.spawn.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.adminMarker.AdminMarker;
-import eu.mhsl.craftattack.spawn.appliances.adminMarker.AdminMarkerListener;
-import eu.mhsl.craftattack.spawn.appliances.afkTag.AfkTag;
-import eu.mhsl.craftattack.spawn.appliances.outlawed.Outlawed;
-import eu.mhsl.craftattack.spawn.appliances.sleepTag.SleepTag;
-import eu.mhsl.craftattack.spawn.appliances.yearRank.YearRank;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentBuilder;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.format.TextColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-
-public class DisplayName extends Appliance {
-    public interface DisplayNamed {
-        @Nullable Component getNamePrefix(Player player);
-    }
-
-    public void update(Player player) {
-        TextColor playerColor = queryAppliance(AdminMarker.class).getPlayerColor(player);
-        List<Supplier<Component>> prefixes = List.of(
-            () -> queryAppliance(Outlawed.class).getNamePrefix(player),
-            () -> queryAppliance(YearRank.class).getNamePrefix(player),
-            () -> queryAppliance(AfkTag.class).getNamePrefix(player),
-            () -> queryAppliance(SleepTag.class).getNamePrefix(player)
-        );
-
-        ComponentBuilder<TextComponent, TextComponent.Builder> playerName = Component.text();
-        prefixes.forEach(supplier -> {
-            Component prefix = supplier.get();
-            if(prefix == null) return;
-            playerName.append(prefix).append(
-                Component.text(" ").hoverEvent(Component.empty().asHoverEvent()));
-        });
-
-        playerName.append(Component.text(player.getName(), playerColor));
-
-        setGlobal(player, playerName.build());
-    }
-
-    private void setGlobal(Player player, Component component) {
-        try {
-            player.customName(component);
-            player.displayName(component);
-            player.playerListName(component);
-        } catch(Exception e) {
-            //TODO this throws often exceptions, but still works, don't know why
-            Main.instance().getLogger().log(Level.SEVERE, e, e::getMessage);
-        }
-    }
-
-
-    @Override
-    @NotNull
-    protected List<Listener> listeners() {
-        return List.of(new AdminMarkerListener());
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java

@@ -1,13 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.displayName;
-
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-public class DisplayNameUpdateListener extends ApplianceListener<DisplayName> {
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onJoin(PlayerJoinEvent event) {
-        getAppliance().update(event.getPlayer());
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/event/listener/ApplyPendingRewardsListener.java

@@ -1,13 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.event.listener;
-
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-public class ApplyPendingRewardsListener extends ApplianceListener<Event> {
-    @EventHandler
-    public void onJoin(PlayerJoinEvent event) {
-        getAppliance().applyPendingRewards(event.getPlayer());
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java

@@ -1,34 +0,0 @@
-package eu.mhsl.craftattack.spawn.appliances.feedback;
-
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.event.HoverEvent;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-
-public class Feedback extends Appliance {
-    public void requestFeedback(String eventName) {
-        List<Player> players = Bukkit.getOnlinePlayers().stream()
-            .map(player -> (Player) player)
-            .toList();
-
-        requestFeedback(eventName, players);
-    }
-
-    public void requestFeedback(String eventName, List<Player> receivers) {
-        receivers.forEach(player -> player.sendMessage(
-            Component.text()
-                .append(Component.text("------------------------------", NamedTextColor.GRAY))
-                .appendNewline()
-                .append(Component.text("Klicke hier und gib Feedback, damit wir dein Spielerlebnis verbessern können!", NamedTextColor.GREEN)
-                    .clickEvent(ClickEvent.openUrl(String.format("https://www.google.com/search?q=%s", eventName))))
-                    .hoverEvent(HoverEvent.showText(Component.text("Klicke, um Feedback zu geben.").color(NamedTextColor.GOLD)))
-                .appendNewline()
-                .append(Component.text("------------------------------", NamedTextColor.GRAY))
-        ));
-    }
-}

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/AntiSignEdit.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java

@@ -1,15 +1,15 @@
-package eu.mhsl.craftattack.spawn.appliances.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import io.papermc.paper.event.player.PlayerOpenSignEvent;
 import org.bukkit.block.sign.SignSide;
 import org.bukkit.event.EventHandler;
 
-public class OnSignEditListener extends ApplianceListener<AntiSignEdit> {
+class OnSignEditListener extends ApplianceListener<AntiSignEdit> {
     @EventHandler
     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));
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/SignEditSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulker.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
@@ -31,7 +31,8 @@ public class AutoShulker extends Appliance {
         ShulkerBox shulkerBox = (ShulkerBox) blockStateMeta.getBlockState();
 
         HashMap<Integer, ItemStack> 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;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulkerSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java

@@ -1,20 +1,20 @@
-package eu.mhsl.craftattack.spawn.appliances.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 
-public class ItemPickupListener extends ApplianceListener<AutoShulker> {
+class ItemPickupListener extends ApplianceListener<AutoShulker> {
     @EventHandler
     public void onPickup(EntityPickupItemEvent event) {
         if(event.getEntity() instanceof Player p) {
             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()));
         }
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/Advancements.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.customAdvancements;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
 public class Advancements {
     public static String searchTrouble = "search_trouble";

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java

@@ -0,0 +1,12 @@
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
+
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class ApplyPendingAdvancementsListener extends ApplianceListener<CustomAdvancements> {
+    @EventHandler
+    public void onJoin(PlayerJoinEvent event) {
+        this.getAppliance().applyPendingAdvancements(event.getPlayer());
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java

@@ -1,9 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.customAdvancements;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener.ApplyPendingAdvancementsListener;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener.CustomAdvancementsListener;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.advancement.Advancement;
@@ -25,15 +23,21 @@ 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;
         }
 
         try {
-            NamespacedKey namespacedKey = Objects.requireNonNull(NamespacedKey.fromString("custom_advancements:craftattack/" + advancementName), "NamespacedKey is invalid!");
+            NamespacedKey namespacedKey = Objects.requireNonNull(
-            Advancement advancement = Objects.requireNonNull(Bukkit.getAdvancement(namespacedKey), "The advancement does not exist!");
+                NamespacedKey.fromString("craftattack_advancements:craftattack/" + advancementName),
+                String.format("NamespacedKey with '%s' is invalid!", advancementName)
+            );
+            Advancement advancement = Objects.requireNonNull(
+                Bukkit.getAdvancement(namespacedKey),
+                String.format("The advancement '%s' does not exist!", namespacedKey.asString())
+            );
             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 +45,14 @@ public class CustomAdvancements extends Appliance {
 
     public void applyPendingAdvancements(Player player) {
         if(this.pendingAdvancements.isEmpty()) return;
-        List<PendingAdvancement> grantedAdvancements = pendingAdvancements.stream()
+        List<PendingAdvancement> 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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java

@@ -1,8 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.Advancements;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -12,7 +10,7 @@ import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancements> {
+class CustomAdvancementsListener extends ApplianceListener<CustomAdvancements> {
     @EventHandler
     public void onEntityDamageEntity(EntityDamageByEntityEvent event) {
         if(!(event.getEntity() instanceof Player damaged)) return;
@@ -20,7 +18,7 @@ public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancem
         if(!damager.getInventory().getItemInMainHand().getType().equals(Material.AIR)) return;
         if(!damaged.hasPermission("admin")) return;
 
-        getAppliance().grantAdvancement(Advancements.searchTrouble, damager.getUniqueId());
+        this.getAppliance().grantAdvancement(Advancements.searchTrouble, damager.getUniqueId());
     }
 
     @EventHandler
@@ -30,12 +28,12 @@ public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancem
         if(!(event.getView().getPlayer() instanceof Player player)) return;
 
         if(result.getType() == Material.RED_SHULKER_BOX) {
-            getAppliance().grantAdvancement(Advancements.fleischerchest, player.getUniqueId());
+            this.getAppliance().grantAdvancement(Advancements.fleischerchest, player.getUniqueId());
             return;
         }
 
         if(result.getItemMeta().itemName().equals(Component.text("98fdf0ae-c3ab-4ef7-ae25-efd518d600de"))) {
-            getAppliance().grantAdvancement(Advancements.craftPixelblock, player.getUniqueId());
+            this.getAppliance().grantAdvancement(Advancements.craftPixelblock, player.getUniqueId());
         }
     }
 
@@ -43,6 +41,6 @@ public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancem
     public void onChangeWorld(PlayerChangedWorldEvent event) {
         if(!event.getPlayer().getWorld().getName().startsWith("plugins/PixelBlocks/worlds")) return;
 
-        getAppliance().grantAdvancement(Advancements.usePixelblock, event.getPlayer().getUniqueId());
+        this.getAppliance().grantAdvancement(Advancements.usePixelblock, event.getPlayer().getUniqueId());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoor.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.doubeDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;
@@ -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));
         };
     }
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoorSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.doubeDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class DoubleDoorSetting extends BoolSetting implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.doubeDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -11,7 +11,7 @@ import org.bukkit.inventory.EquipmentSlot;
 
 import java.util.Objects;
 
-public class OnDoorInteractListener extends ApplianceListener<DoubleDoor> {
+class OnDoorInteractListener extends ApplianceListener<DoubleDoor> {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if(!event.hasBlock()) return;
@@ -22,6 +22,6 @@ public class OnDoorInteractListener extends ApplianceListener<DoubleDoor> {
         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);
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/Fleischerchest.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.fleischerchest;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.text.Component;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.fleischerchest;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
@@ -6,13 +6,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.PrepareItemCraftEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class FleischerchestCraftItemListener extends ApplianceListener<Fleischerchest> {
+class FleischerchestCraftItemListener extends ApplianceListener<Fleischerchest> {
     @EventHandler
     public void onPrepareItemCraft(PrepareItemCraftEvent event) {
         ItemStack result = event.getInventory().getResult();
         if(result == null) return;
         if(result.getType() != Material.RED_SHULKER_BOX) return;
 
-        getAppliance().renameItem(event.getInventory().getResult());
+        this.getAppliance().renameItem(event.getInventory().getResult());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/GlowingBerries.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.glowingBerries;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.sound.Sound;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java

@@ -1,13 +1,14 @@
-package eu.mhsl.craftattack.spawn.appliances.glowingBerries;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 
-public class OnBerryEaten extends ApplianceListener<GlowingBerries> {
+class OnBerryEaten extends ApplianceListener<GlowingBerries> {
     @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());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefill.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.hotbarRefill;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -47,7 +47,6 @@ public class HotbarRefill extends Appliance {
                 player.sendActionBar(Component.text("Die Hotbar wurde aufgefüllt", NamedTextColor.GREEN));
             }, 1);
         } catch(NoSuchElementException ignored) {
-            player.sendActionBar(Component.text("Keine weiteren Items dieser Art im Inventar vorhanden", NamedTextColor.RED));
         }
     }
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java

@@ -1,7 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.hotbarRefill;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -9,7 +10,9 @@ import org.bukkit.event.player.PlayerItemBreakEvent;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
+import java.util.List;
+
+class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
     private HotbarRefillSetting.HotbarReplaceConfig getPlayerSetting(Player player) {
         return Settings.instance().getSetting(
             player,
@@ -23,22 +26,24 @@ public class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
         ItemStack stackInHand = event.getItemInHand();
         if(stackInHand.getAmount() != 1) return;
         if(stackInHand.getType().getMaxDurability() > 0) return;
+        if(stackInHand.getType().getMaxStackSize() > 0) return;
 
-        if(!getPlayerSetting(event.getPlayer()).onBlocks()) return;
+        if(!this.getPlayerSetting(event.getPlayer()).onBlocks()) return;
-        getAppliance().handleHotbarChange(event.getPlayer(), stackInHand);
+        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(List.of(Material.POTION, Material.HONEY_BOTTLE).contains(event.getItem().getType())) return;
+        if(!this.getPlayerSetting(event.getPlayer()).onConsumable()) return;
 
-        getAppliance().handleHotbarChange(event.getPlayer(), event.getItem());
+        this.getAppliance().handleHotbarChange(event.getPlayer(), event.getItem());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.hotbarRefill;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.MultiBoolSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting;
 import org.bukkit.Material;
 
 public class HotbarRefillSetting extends MultiBoolSetting<HotbarRefillSetting.HotbarReplaceConfig> implements CategorizedSetting {
@@ -16,7 +16,8 @@ public class HotbarRefillSetting extends MultiBoolSetting<HotbarRefillSetting.Ho
         @DisplayName("Blöcke") boolean onBlocks,
         @DisplayName("Werkzeuge") boolean onTools,
         @DisplayName("Essen") boolean onConsumable
-    ) {}
+    ) {
+    }
 
     public HotbarRefillSetting() {
         super(Settings.Key.HotbarReplacer);

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoor.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -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);

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.GameMode;
@@ -7,12 +7,12 @@ import org.bukkit.block.data.type.Door;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockDamageAbortEvent;
 
-public class KnockDoorListener extends ApplianceListener<KnockDoor> {
+class KnockDoorListener extends ApplianceListener<KnockDoor> {
     @EventHandler
     public void onKnock(BlockDamageAbortEvent event) {
         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);
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java

@@ -0,0 +1,7 @@
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
+
+class OutlawChangeNotPermitted extends Exception {
+    public OutlawChangeNotPermitted(String message) {
+        super(message);
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/Outlawed.java

@@ -1,10 +1,10 @@
-package eu.mhsl.craftattack.spawn.appliances.outlawed;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName;
-import eu.mhsl.craftattack.spawn.appliances.whitelist.Whitelist;
+import eu.mhsl.craftattack.spawn.appliances.tooling.whitelist.Whitelist;
 import eu.mhsl.craftattack.spawn.config.Configuration;
 import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
 import net.kyori.adventure.text.Component;
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-public class Outlawed extends Appliance implements DisplayName.DisplayNamed {
+public class Outlawed extends Appliance implements DisplayName.Prefixed {
     public final int timeoutInMs = 1000 * 60 * 60 * 6;
     private final Map<UUID, Long> timeouts = new HashMap<>();
 
@@ -34,13 +34,13 @@ public class Outlawed extends Appliance implements DisplayName.DisplayNamed {
         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).fullIntegrityCheck(player);
                 } catch(DisconnectInfo.Throwable e) {
-                    Bukkit.getScheduler().runTask(Main.instance(), () -> e.getDisconnectScreen().applyKick(player));
+                    e.getDisconnectScreen().applyKick(player);
                 }
             }),
             20 * 60,
@@ -49,55 +49,55 @@ public class Outlawed extends Appliance implements DisplayName.DisplayNamed {
     }
 
     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);
+        this.setLawStatus(player, this.isOutlawed(player) ? Status.DISABLED : Status.VOLUNTARILY);
-        setTimeout(player);
+        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 -> {
+        return this.playerStatusMap.computeIfAbsent(player, p -> {
-            if(localConfig().getStringList(voluntarilyEntry).contains(p.getUniqueId().toString()))
+            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);
+        this.playerStatusMap.put(player, status);
-        queryAppliance(DisplayName.class).update(player);
+        this.queryAppliance(DisplayName.class).update(player);
 
-        List<String> newList = localConfig().getStringList(voluntarilyEntry);
+        List<String> 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.DisplayNamed {
 
     @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!")));
         }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.outlawed;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-public class OutlawedCommand extends ApplianceCommand.PlayerChecked<Outlawed> {
+class OutlawedCommand extends ApplianceCommand.PlayerChecked<Outlawed> {
     public OutlawedCommand() {
         super("vogelfrei");
     }
@@ -15,10 +15,10 @@ public class OutlawedCommand extends ApplianceCommand.PlayerChecked<Outlawed> {
     @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()
+                this.getAppliance()
-                    .getStatusDescription(getAppliance().getLawStatus(getPlayer()))
+                    .getStatusDescription(this.getAppliance().getLawStatus(this.getPlayer()))
             );
         } catch(OutlawChangeNotPermitted e) {
             sender.sendMessage(Component.text(e.getMessage(), NamedTextColor.RED));

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java

@@ -0,0 +1,14 @@
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
+
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class OutlawedReminderListener extends ApplianceListener<Outlawed> {
+    @EventHandler
+    public void onJoin(PlayerJoinEvent e) {
+        if(this.getAppliance().isOutlawed(e.getPlayer())) {
+            e.getPlayer().sendMessage(this.getAppliance().getStatusDescription(this.getAppliance().getLawStatus(e.getPlayer())));
+        }
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
@@ -6,11 +6,11 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-public class OnCraftingTableUseListener extends ApplianceListener<PortableCrafting> {
+class OnCraftingTableUseListener extends ApplianceListener<PortableCrafting> {
     @EventHandler
     public void inInteract(PlayerInteractEvent event) {
         if(!event.getAction().equals(Action.RIGHT_CLICK_AIR)) return;
         if(!event.getMaterial().equals(Material.CRAFTING_TABLE)) return;
-        getAppliance().openFor(event.getPlayer());
+        this.getAppliance().openFor(event.getPlayer());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCrafting.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCraftingSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class PortableCraftingSetting extends BoolSetting implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockback.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.snowballKnockback;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.snowballKnockback;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import org.bukkit.entity.Entity;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java

@@ -1,11 +1,13 @@
-package eu.mhsl.craftattack.spawn.appliances.snowballKnockback;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.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;
 
-public class SnowballKnockbackListener extends ApplianceListener<SnowballKnockback> {
+class SnowballKnockbackListener extends ApplianceListener<SnowballKnockback> {
     @EventHandler
     public void onSnowballHit(ProjectileHitEvent event) {
         if(event.getHitEntity() == null) return;
@@ -13,6 +15,6 @@ public class SnowballKnockbackListener extends ApplianceListener<SnowballKnockba
         if(!(event.getHitEntity() instanceof LivingEntity hitEntity)) return;
 
         Entity snowball = event.getEntity();
-        getAppliance().dealSnowballKnockback(hitEntity, snowball);
+        this.getAppliance().dealSnowballKnockback(hitEntity, snowball);
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/Debug.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.debug;
+package eu.mhsl.craftattack.spawn.appliances.internal.debug;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.debug.command.AppliancesCommand;
+import eu.mhsl.craftattack.spawn.appliances.internal.debug.command.AppliancesCommand;
-import eu.mhsl.craftattack.spawn.appliances.debug.command.UserInfoCommand;
+import eu.mhsl.craftattack.spawn.appliances.internal.debug.command.UserInfoCommand;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/AppliancesCommand.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.debug.command;
+package eu.mhsl.craftattack.spawn.appliances.internal.debug.command;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.debug.Debug;
+import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug;
 import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;

src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/UserInfoCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.debug.command;
+package eu.mhsl.craftattack.spawn.appliances.internal.debug.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.debug.Debug;
+import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -50,13 +50,13 @@ public class UserInfoCommand extends ApplianceCommand<Debug> {
                 .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()

src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClear.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.titleClear;
+package eu.mhsl.craftattack.spawn.appliances.internal.titleClear;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import org.bukkit.entity.Player;

src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.appliances.titleClear;
+package eu.mhsl.craftattack.spawn.appliances.internal.titleClear;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-public class TitleClearListener extends ApplianceListener<TitleClear> {
+class TitleClearListener extends ApplianceListener<TitleClear> {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        getAppliance().clearTitle(event.getPlayer());
+        this.getAppliance().clearTitle(event.getPlayer());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/adminMarker/AdminMarker.java

@@ -1,13 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.adminMarker;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Color;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
 
 public class AdminMarker extends Appliance {
     public TextColor getPlayerColor(Player player) {
@@ -15,10 +11,4 @@ public class AdminMarker extends Appliance {
             return TextColor.color(Color.AQUA.asRGB()); // TODO read permission from config
         return TextColor.color(Color.WHITE.asRGB());
     }
-
-    @Override
-    @NotNull
-    protected List<Listener> listeners() {
-        return List.of(new AdminMarkerListener());
-    }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.afkTag;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import io.papermc.paper.event.player.AsyncChatEvent;
@@ -7,24 +7,24 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-public class AfkResetListener extends ApplianceListener<AfkTag> {
+class AfkResetListener extends ApplianceListener<AfkTag> {
     @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());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkTag.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.afkTag;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -13,13 +13,15 @@ import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
 import java.util.List;
-import java.util.WeakHashMap;
+import java.util.Objects;
+import java.util.UUID;
 
-public class AfkTag extends Appliance implements DisplayName.DisplayNamed {
+public class AfkTag extends Appliance implements DisplayName.Prefixed {
-    private final WeakHashMap<Player, Long> afkTimings = new WeakHashMap<>();
+    private final HashMap<UUID, Long> afkTimings = new HashMap<>();
     private static final int updateIntervalSeconds = 30;
-    private static final int afkWhenMillis = 5 * 60 * 1000;
+    private static final int afkWhenMillis = 3 * 60 * 1000;
 
     @Override
     public void onEnable() {
@@ -32,22 +34,23 @@ public class AfkTag extends Appliance implements DisplayName.DisplayNamed {
     }
 
     public void resetTiming(Player player) {
-        boolean wasAfk = isAfk(player);
+        boolean wasAfk = this.isAfk(player);
-        this.afkTimings.put(player, System.currentTimeMillis());
+        this.afkTimings.put(player.getUniqueId(), System.currentTimeMillis());
-        if (wasAfk) this.updateAfkPrefix(player);
+        if(wasAfk) this.updateAfkPrefix(player);
     }
 
     private void checkAfkPlayers() {
-        this.afkTimings.keySet().forEach((player) -> {
+        this.afkTimings.keySet().stream()
-            if(!isAfk(player)) return;
+            .map(Bukkit::getPlayer)
-            this.updateAfkPrefix(player);
+            .filter(Objects::nonNull)
-        });
+            .filter(this::isAfk)
+            .forEach(this::updateAfkPrefix);
     }
 
     private boolean isAfk(Player player) {
         if(player.isSleeping()) return false;
 
-        long lastTimeActive = this.afkTimings.getOrDefault(player, 0L);
+        long lastTimeActive = this.afkTimings.getOrDefault(player.getUniqueId(), 0L);
         long timeSinceLastActive = System.currentTimeMillis() - lastTimeActive;
         return timeSinceLastActive >= afkWhenMillis;
     }
@@ -58,7 +61,7 @@ public class AfkTag extends Appliance implements DisplayName.DisplayNamed {
 
     @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;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMention.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMention;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.sound.Sound;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -56,7 +56,7 @@ public class ChatMention extends Appliance {
     @Override
     public void onEnable() {
         Settings.instance().declareSetting(ChatMentionSetting.class);
-        refreshPlayers();
+        this.refreshPlayers();
     }
 
     @Override

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMention;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.chatMessages.ChatMessages;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
 import io.papermc.paper.event.player.AsyncChatDecorateEvent;
 import net.kyori.adventure.text.Component;
@@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChatMentionListener extends ApplianceListener<ChatMention> {
+class ChatMentionListener extends ApplianceListener<ChatMention> {
     @SuppressWarnings("UnstableApiUsage")
     @EventHandler
     public void coloringEvent(AsyncChatDecorateEvent event) {
@@ -30,11 +30,11 @@ public class ChatMentionListener extends ApplianceListener<ChatMention> {
         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<ChatMention> {
             .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();
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMention;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.MultiBoolSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting;
 import org.bukkit.Material;
 
 public class ChatMentionSetting extends MultiBoolSetting<ChatMentionSetting.ChatMentionConfig> implements CategorizedSetting {
@@ -15,7 +15,8 @@ public class ChatMentionSetting extends MultiBoolSetting<ChatMentionSetting.Chat
     public record ChatMentionConfig(
         @DisplayName("Spielernamen hervorheben") boolean applyMentions,
         @DisplayName("Benachrichtigungston") boolean notifyOnMention
-    ) {}
+    ) {
+    }
 
     public ChatMentionSetting() {
         super(Settings.Key.ChatMentions);

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessages.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMessages;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
@@ -19,7 +19,7 @@ public class ChatMessages extends Appliance {
     }
 
     public Component getReportablePlayerName(Player player) {
-        return addReportActions(player.displayName(), player.getName());
+        return this.addReportActions(player.displayName(), player.getName());
     }
 
     public Component addReportActions(Component message, String username) {

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMessages;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import eu.mhsl.craftattack.spawn.util.IteratorUtil;
 import io.papermc.paper.event.player.AsyncChatEvent;
 import net.kyori.adventure.text.Component;
@@ -9,25 +9,26 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Color;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.Optional;
 
-public class ChatMessagesListener extends ApplianceListener<ChatMessages> {
+class ChatMessagesListener extends ApplianceListener<ChatMessages> {
     @EventHandler
     public void onPlayerChatEvent(AsyncChatEvent event) {
         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()))
         );
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerJoin(PlayerJoinEvent event) {
         event.joinMessage(null);
         IteratorUtil.onlinePlayers(player -> {
@@ -35,7 +36,7 @@ public class ChatMessagesListener extends ApplianceListener<ChatMessages> {
             player.sendMessage(
                 Component
                     .text(">>> ").color(NamedTextColor.GREEN)
-                    .append(getAppliance().getReportablePlayerName(event.getPlayer()))
+                    .append(this.getAppliance().getReportablePlayerName(event.getPlayer()))
             );
         });
     }
@@ -48,7 +49,7 @@ public class ChatMessagesListener extends ApplianceListener<ChatMessages> {
             player.sendMessage(
                 Component
                     .text("<<< ").color(NamedTextColor.RED)
-                    .append(getAppliance().getReportablePlayerName(event.getPlayer()))
+                    .append(this.getAppliance().getReportablePlayerName(event.getPlayer()))
             );
         });
     }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ShowJoinAndLeaveMessagesSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.chatMessages;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
 
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class ShowJoinAndLeaveMessagesSetting extends BoolSetting implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayName.java

@@ -0,0 +1,75 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed.Outlawed;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker.AdminMarker;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag.AfkTag;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.sleepTag.SleepTag;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.yearRank.YearRank;
+import eu.mhsl.craftattack.spawn.util.server.Floodgate;
+import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentBuilder;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+
+public class DisplayName extends Appliance {
+    public interface Prefixed {
+        @Nullable
+        Component getNamePrefix(Player player);
+    }
+
+    public void update(Player player) {
+        TextColor playerColor = this.queryAppliance(AdminMarker.class).getPlayerColor(player);
+        List<Supplier<Prefixed>> prefixes = List.of(
+            () -> this.queryAppliance(Outlawed.class),
+            () -> this.queryAppliance(YearRank.class),
+            () -> this.queryAppliance(AfkTag.class),
+            () -> this.queryAppliance(SleepTag.class)
+        );
+
+        ComponentBuilder<TextComponent, TextComponent.Builder> playerName = Component.text();
+        prefixes.stream()
+            .map(prefixed -> prefixed.get().getNamePrefix(player))
+            .filter(Objects::nonNull)
+            .forEach(prefix -> playerName
+                .append(prefix)
+                .append(ComponentUtil.clearedSpace())
+        );
+
+        if(Floodgate.isBedrock(player)) {
+            playerName
+                .append(
+                    Component.text("\uD83C\uDFAE", NamedTextColor.GRAY)
+                        .hoverEvent(HoverEvent.showText(Component.text(
+                            String.format("%s spielt die Minecraft: Bedrock Edition", player.getName())
+                        )))
+                )
+                .append(ComponentUtil.clearedSpace());
+        }
+
+        playerName.append(Component.text(player.getName(), playerColor));
+
+        this.setGlobal(player, playerName.build());
+    }
+
+    private void setGlobal(Player player, Component component) {
+        try {
+            player.customName(component);
+            player.displayName(component);
+            player.playerListName(component);
+        } catch(Exception e) {
+            Main.instance().getLogger().log(Level.SEVERE, e, e::getMessage);
+        }
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java

@@ -0,0 +1,13 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName;
+
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class DisplayNameUpdateListener extends ApplianceListener<DisplayName> {
+    @EventHandler(priority = EventPriority.LOW)
+    public void onJoin(PlayerJoinEvent event) {
+        this.getAppliance().update(event.getPlayer());
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/ApplyPendingRewardsListener.java

@@ -0,0 +1,12 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event;
+
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class ApplyPendingRewardsListener extends ApplianceListener<Event> {
+    @EventHandler
+    public void onJoin(PlayerJoinEvent event) {
+        this.getAppliance().applyPendingRewards(event.getPlayer());
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java

@@ -1,15 +1,16 @@
-package eu.mhsl.craftattack.spawn.appliances.event;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event;
 
-import com.google.gson.Gson;
 import eu.mhsl.craftattack.spawn.Main;
-import eu.mhsl.craftattack.spawn.api.HttpServer;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.api.client.repositories.EventRepository;
+import eu.mhsl.craftattack.spawn.api.server.HttpServer;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.Advancements;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements;
-import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements;
-import eu.mhsl.craftattack.spawn.appliances.event.command.*;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command.*;
-import eu.mhsl.craftattack.spawn.appliances.event.listener.ApplyPendingRewardsListener;
 import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.spawn.util.api.HttpStatus;
 import eu.mhsl.craftattack.spawn.util.entity.DisplayVillager;
 import eu.mhsl.craftattack.spawn.util.listener.DismissInventoryOpenFromHolder;
 import eu.mhsl.craftattack.spawn.util.listener.PlayerInteractAtEntityEventListener;
@@ -27,12 +28,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
 import java.util.*;
 
 public class Event extends Appliance {
@@ -57,7 +52,6 @@ public class Event extends Appliance {
     private boolean isOpen = false;
     private AdvertisementStatus advertiseStatus = AdvertisementStatus.BEFORE;
     private UUID roomId;
-    private final HttpClient eventServerClient = HttpClient.newHttpClient();
     private final List<Reward> pendingRewards = new ArrayList<>();
 
     record RewardConfiguration(String memorialMaterial, String memorialTitle, String memorialLore, List<UUID> memorials,
@@ -74,85 +68,67 @@ public class Event extends Appliance {
     @Override
     public void onEnable() {
         this.villager = new DisplayVillager.ConfigBound(
-            localConfig(),
+            this.localConfig(),
             villager -> {
                 villager.customName(Component.text("Events", NamedTextColor.GOLD));
                 villager.setProfession(Villager.Profession.LIBRARIAN);
                 villager.setVillagerType(Villager.Type.SNOW);
             }
         );
-        this.isOpen = localConfig().getBoolean("enabled", false);
+        this.isOpen = this.localConfig().getBoolean("enabled", false);
-        if(this.isOpen) this.roomId = UUID.fromString(localConfig().getString("roomId", ""));
+        if(this.isOpen) this.roomId = UUID.fromString(this.localConfig().getString("roomId", ""));
     }
 
-    public void openEvent() throws URISyntaxException, IOException, InterruptedException {
+    public void openEvent() {
-        if(isOpen) throw new ApplianceCommand.Error("Es läuft derzeit bereits ein Event!");
+        if(this.isOpen) throw new ApplianceCommand.Error("Es läuft derzeit bereits ein Event!");
-        HttpRequest createRoomRequest = HttpRequest.newBuilder()
-            .uri(new URI(localConfig().getString("api") + "/room"))
-            .POST(HttpRequest.BodyPublishers.noBody())
-            .build();
 
-        HttpResponse<String> rawResponse = eventServerClient.send(createRoomRequest, HttpResponse.BodyHandlers.ofString());
+        Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> {
-        if(rawResponse.statusCode() != 200)
+            ReqResp<EventRepository.CreatedRoom> sessionResponse = this.queryRepository(EventRepository.class).createSession();
-            throw new ApplianceCommand.Error("Event-Server meldet Fehler: " + rawResponse.statusCode());
 
-        record Response(UUID uuid) {
+            if(sessionResponse.status() != HttpStatus.OK)
-        }
+                throw new ApplianceCommand.Error("Event-Server meldet Fehler: " + sessionResponse.status());
-        Response response = new Gson().fromJson(rawResponse.body(), Response.class);
 
-        isOpen = true;
+            this.isOpen = true;
-        roomId = response.uuid;
+            this.roomId = sessionResponse.data().uuid();
+        });
     }
 
     public void joinEvent(Player p) {
-        if(!isOpen) {
+        if(!this.isOpen) {
             p.sendMessage(Component.text("Zurzeit ist kein Event geöffnet.", NamedTextColor.RED));
             return;
         }
 
-        if(!p.hasPermission("admin") && advertiseStatus == AdvertisementStatus.BEFORE) {
+        if(!p.hasPermission("admin") && this.advertiseStatus == AdvertisementStatus.BEFORE) {
             p.sendMessage(Component.text("Die Event befinden sich noch in der Vorbereitung.", NamedTextColor.RED));
             return;
         }
 
-        if(!p.hasPermission("admin") && advertiseStatus == AdvertisementStatus.DONE) {
+        if(!p.hasPermission("admin") && this.advertiseStatus == AdvertisementStatus.DONE) {
             p.sendMessage(Component.text("Die Events laufen bereits. Ein nachträgliches Beitreten ist nicht möglich.", NamedTextColor.RED));
             return;
         }
 
-        try {
         Main.instance().getLogger().info("Verbinde mit eventserver: " + p.getName());
         p.sendMessage(Component.text("Authentifiziere...", NamedTextColor.GREEN));
-            record Request(UUID player, UUID room) {
-            }
-            Request request = new Request(p.getUniqueId(), this.roomId);
-            HttpRequest queueRoomRequest = HttpRequest.newBuilder()
-                .uri(new URI(localConfig().getString("api") + "/queueRoom"))
-                .POST(HttpRequest.BodyPublishers.ofString(new Gson().toJson(request)))
-                .build();
 
-            record Response(String error) {
+        Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> {
-            }
+            ReqResp<EventRepository.QueueRoom.Response> queueResponse = this.queryRepository(EventRepository.class)
-            HttpResponse<String> rawResponse = eventServerClient.send(queueRoomRequest, HttpResponse.BodyHandlers.ofString());
+                .queueRoom(new EventRepository.QueueRoom(p.getUniqueId(), this.roomId));
-            Main.instance().getLogger().info("Response: " + rawResponse.body());
-            Response response = new Gson().fromJson(rawResponse.body(), Response.class);
 
-            if(rawResponse.statusCode() != 200 || response.error != null) {
+            if(queueResponse.status() != HttpStatus.OK || queueResponse.data().error() != null) {
-                p.sendMessage(Component.text("Fehler beim Betreten: " + response.error, NamedTextColor.RED));
+                p.sendMessage(Component.text("Fehler beim Betreten: " + queueResponse.data().error(), NamedTextColor.RED));
                 return;
             }
 
             p.sendMessage(Component.text("Betrete...", NamedTextColor.GREEN));
-            PluginMessage.connect(p, localConfig().getString("connect-server-name"));
+            PluginMessage.connect(p, this.localConfig().getString("connect-server-name"));
-
+        });
-        } catch(URISyntaxException | IOException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     public void endEvent() {
-        if(!isOpen) throw new ApplianceCommand.Error("Es läuft derzeit kein Event!");
+        if(!this.isOpen) throw new ApplianceCommand.Error("Es läuft derzeit kein Event!");
-        isOpen = false;
+        this.isOpen = false;
     }
 
     private void rewardPlayers(RewardConfiguration rewardConfiguration) {
@@ -160,10 +136,10 @@ public class Event extends Appliance {
             Reward reward = new Reward(uuid, new ItemStack(Objects.requireNonNull(Material.matchMaterial(rewardConfiguration.material)), amount));
 
             if(Bukkit.getPlayer(uuid) == null) {
-                pendingRewards.add(reward);
+                this.pendingRewards.add(reward);
                 return;
             }
-            giveReward(reward);
+            this.giveReward(reward);
         });
 
         rewardConfiguration.memorials.forEach(uuid -> {
@@ -177,10 +153,10 @@ public class Event extends Appliance {
             Main.instance().getAppliance(CustomAdvancements.class).grantAdvancement(Advancements.participateEvent, uuid);
 
             if(Bukkit.getPlayer(uuid) == null) {
-                pendingRewards.add(memorial);
+                this.pendingRewards.add(memorial);
                 return;
             }
-            giveReward(memorial);
+            this.giveReward(memorial);
         });
 
         rewardConfiguration.rewards.keySet().stream()
@@ -208,7 +184,7 @@ public class Event extends Appliance {
     }
 
     public void advertise() {
-        advertiseCountdown.cancelIfRunning();
+        this.advertiseCountdown.cancelIfRunning();
         this.advertiseStatus = AdvertisementStatus.ADVERTISED;
         IteratorUtil.onlinePlayers(player -> player.sendMessage(
             Component.text()
@@ -219,7 +195,7 @@ public class Event extends Appliance {
                 .append(Component.text(", um dem Event beizutreten!")).appendNewline()
                 .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline()
         ));
-        advertiseCountdown.start();
+        this.advertiseCountdown.start();
     }
 
     @Override
@@ -247,7 +223,7 @@ public class Event extends Appliance {
     protected List<Listener> listeners() {
         return List.of(
             new ApplyPendingRewardsListener(),
-            new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> joinEvent(playerInteractAtEntityEvent.getPlayer())),
+            new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> this.joinEvent(playerInteractAtEntityEvent.getPlayer())),
             new DismissInventoryOpenFromHolder(this.villager.getUniqueId())
         );
     }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventAdvertiseCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.event.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +13,6 @@ public class EventAdvertiseCommand extends ApplianceCommand<Event> {
 
     @Override
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
-        getAppliance().advertise();
+        this.getAppliance().advertise();
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.event.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +13,6 @@ public class EventCommand extends ApplianceCommand.PlayerChecked<Event> {
 
     @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());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventEndSessionCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.event.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +13,6 @@ public class EventEndSessionCommand extends ApplianceCommand<Event> {
 
     @Override
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        getAppliance().endEvent();
+        this.getAppliance().endEvent();
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventOpenSessionCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.event.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -15,7 +15,7 @@ public class EventOpenSessionCommand extends ApplianceCommand<Event> {
 
     @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));
+        sender.sendMessage(Component.text("Event-Server gestartet!", NamedTextColor.GREEN));
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.event.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.event.Event;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +13,6 @@ public class MoveEventVillagerCommand extends ApplianceCommand.PlayerChecked<Eve
 
     @Override
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        getAppliance().villager.updateLocation(getPlayer().getLocation());
+        this.getAppliance().villager.updateLocation(this.getPlayer().getLocation());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java

@@ -0,0 +1,77 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.api.client.repositories.FeedbackRepository;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.util.api.HttpStatus;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentBuilder;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class Feedback extends Appliance {
+    public Feedback() {
+        super("feedback");
+    }
+
+    public void requestFeedback(String eventName, List<Player> receivers, @Nullable String question) {
+        ReqResp<Map<UUID, String>> response = this.queryRepository(FeedbackRepository.class).createFeedbackUrls(
+            new FeedbackRepository.Request(eventName, receivers.stream().map(Entity::getUniqueId).toList())
+        );
+
+        System.out.println(response.toString());
+        System.out.println(response.status());
+
+        if(response.status() != HttpStatus.CREATED) throw new RuntimeException();
+
+        Component border = Component.text("-".repeat(40), NamedTextColor.GRAY);
+
+        receivers.forEach(player -> {
+            String feedbackUrl = response.data().get(player.getUniqueId());
+            if(feedbackUrl == null) {
+                Main.logger().warning(String.format("FeedbackUrl not found for player '%s' from backend!", player.getUniqueId()));
+                return;
+            }
+
+            ComponentBuilder<TextComponent, TextComponent.Builder> message = Component.text()
+                .append(border)
+                .appendNewline();
+
+            if(question != null) {
+                message
+                    .append(Component.text(question, NamedTextColor.GREEN))
+                    .appendNewline()
+                    .appendNewline();
+            }
+
+            message
+                .append(Component.text("Klicke hier und gib uns Feedback, damit wir dein Spielerlebnis verbessern können!", NamedTextColor.DARK_GREEN)
+                    .clickEvent(ClickEvent.openUrl(feedbackUrl)))
+                .hoverEvent(HoverEvent.showText(Component.text("Klicke, um Feedback zu geben.")))
+                .appendNewline()
+                .append(border);
+
+            player.sendMessage(message.build());
+        });
+    }
+
+    @Override
+    protected @NotNull List<ApplianceCommand<?>> commands() {
+        return List.of(
+            new FeedbackCommand(),
+            new RequestFeedbackCommand()
+        );
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/FeedbackCommand.java

@@ -0,0 +1,30 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+class FeedbackCommand extends ApplianceCommand.PlayerChecked<Feedback> {
+    public FeedbackCommand() {
+        super("feedback");
+    }
+
+    @Override
+    protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
+        sender.sendMessage(ComponentUtil.pleaseWait());
+        Bukkit.getScheduler().runTaskAsynchronously(
+            Main.instance(),
+            () -> this.getAppliance().requestFeedback(
+                "self-issued-ingame",
+                List.of(this.getPlayer()),
+                null
+            )
+        );
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/RequestFeedbackCommand.java

@@ -0,0 +1,27 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+class RequestFeedbackCommand extends ApplianceCommand<Feedback> {
+    public RequestFeedbackCommand() {
+        super("requestFeedback");
+    }
+
+    @Override
+    protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
+        Bukkit.getScheduler().runTaskAsynchronously(
+            Main.instance(),
+            () -> this.getAppliance().requestFeedback(
+                "admin-issued-ingame",
+                new ArrayList<>(Bukkit.getOnlinePlayers()), String.join(" ", args)
+            )
+        );
+    }
+}

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/Help.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.appliances.help;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help;
 
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.command.DiscordCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.DiscordCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.command.HelpCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.HelpCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.command.SpawnCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.SpawnCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.command.TeamspeakCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.TeamspeakCommand;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/DiscordCommand.java

@@ -1,8 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.help.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.Help;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -13,11 +14,14 @@ public class DiscordCommand extends ApplianceCommand<Help> {
         super("discord");
     }
 
+    private final static String discordLink = "https://discord.gg/TXxspGVanq";
+
     @Override
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
         sender.sendMessage(
-            Component.text("Einen offiziellen Discord Server gibt es nicht, aber Du kannst gerne unserem Teamspeak joinen: ", NamedTextColor.GOLD)
+            Component.text("Offizieller Discord Server: ", NamedTextColor.GOLD)
-                .append(Component.text("mhsl.eu", NamedTextColor.AQUA))
+                .append(Component.text(discordLink, NamedTextColor.AQUA))
+                .clickEvent(ClickEvent.openUrl(discordLink))
         );
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/HelpCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.help.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.Help;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -18,7 +18,8 @@ public class HelpCommand extends ApplianceCommand<Help> {
         sender.sendMessage(
             Component.text("Willkommen auf Craftattack!", NamedTextColor.GOLD)
                 .appendNewline()
-                .append(Component.text("Hier ist ein Hilfetext!", NamedTextColor.GRAY))
+                .append(Component.text("Wenn du hilfe benötigst kannst du dich jederzeit an einen Admin wenden." +
+                    " Weitere Informationen zu Funktionen und Befehlen erhältst du zudem im Turm am Spawn.", NamedTextColor.GRAY))
         );
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/SpawnCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.help.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.Help;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -19,8 +19,8 @@ public class SpawnCommand extends ApplianceCommand<Help> {
 
     @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));
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/TeamspeakCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.help.command;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.help.Help;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -17,12 +17,12 @@ public class TeamspeakCommand extends ApplianceCommand<Help> {
 
     @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)))
         );
     }
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/Bar.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
 
 import eu.mhsl.craftattack.spawn.Main;
 import net.kyori.adventure.bossbar.BossBar;
@@ -56,7 +56,9 @@ public abstract class Bar {
         return Math.clamp(this.progress(), 0, 1);
     }
 
-    protected void beforeRefresh() {}
+    protected void beforeRefresh() {
+    }
+
     protected abstract Duration refresh();
     protected abstract String name();
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class InfoBarCommand extends ApplianceCommand.PlayerChecked<InfoBars> {
+class InfoBarCommand extends ApplianceCommand.PlayerChecked<InfoBars> {
     public InfoBarCommand() {
         super("infobar");
     }
@@ -17,9 +17,9 @@ public class InfoBarCommand extends ApplianceCommand.PlayerChecked<InfoBars> {
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
         if(args.length == 0) throw new Error("<show|hide|hideall> [bar name]");
         switch(args[0]) {
-            case "hideAll" -> getAppliance().hideAll(getPlayer());
+            case "hideAll" -> this.getAppliance().hideAll(this.getPlayer());
-            case "show" -> getAppliance().show(getPlayer(), args[1]);
+            case "show" -> this.getAppliance().show(this.getPlayer(), args[1]);
-            case "hide" -> getAppliance().hide(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<InfoBars> {
     @Override
     public @Nullable List<String> 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();
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBars.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.MsptBar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.MsptBar;
-import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.PlayerCounterBar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.PlayerCounterBar;
-import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.TpsBar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.TpsBar;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -51,32 +51,33 @@ public class InfoBars extends Appliance {
 
     private List<String> getStoredBars(Player player) {
         PersistentDataContainer container = player.getPersistentDataContainer();
-        if(!container.has(infoBarKey)) return List.of();
+        if(!container.has(this.infoBarKey)) return List.of();
-        return container.get(infoBarKey, PersistentDataType.LIST.strings());
+        return container.get(this.infoBarKey, PersistentDataType.LIST.strings());
     }
 
     private void setStoredBars(Player player, List<String> 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<Bar> getInfoBars() {
-        return infoBars;
+        return this.infoBars;
     }
 
     @Override
     public void onDisable() {
-        infoBars.forEach(Bar::stopUpdate);
+        this.infoBars.forEach(Bar::stopUpdate);
     }
 
     @Override

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-public class ShowPreviousBarsListener extends ApplianceListener<InfoBars> {
+class ShowPreviousBarsListener extends ApplianceListener<InfoBars> {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        getAppliance().showAll(event.getPlayer());
+//        this.getAppliance().showAll(event.getPlayer());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/MsptBar.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars.bars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
 
-import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
 import eu.mhsl.craftattack.spawn.util.statistics.ServerMonitor;
 import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/PlayerCounterBar.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars.bars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
 
 import eu.mhsl.craftattack.spawn.Main;
-import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
-import eu.mhsl.craftattack.spawn.appliances.playerlimit.PlayerLimit;
+import eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit.PlayerLimit;
 import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/TpsBar.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.infoBars.bars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
 
-import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
 import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/OptionLinks.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.optionLinks;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.optionLinks;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
@@ -17,10 +17,17 @@ import java.util.logging.Level;
 
 @SuppressWarnings("UnstableApiUsage")
 public class OptionLinks extends Appliance {
-    record ComponentSupplier() {}
+    record ComponentSupplier() {
-    record UriSupplier(Player player) {}
+    }
-    record UriConsumer(String uri) {}
+
-    record SuppliedLink(Function<ComponentSupplier, Component> component, Function<UriSupplier, UriConsumer> uri) {}
+    record UriSupplier(Player player) {
+    }
+
+    record UriConsumer(String uri) {
+    }
+
+    record SuppliedLink(Function<ComponentSupplier, Component> component, Function<UriSupplier, UriConsumer> uri) {
+    }
 
     List<SuppliedLink> links = List.of(
         new SuppliedLink(

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.appliances.optionLinks;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.optionLinks;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-public class UpdateLinksListener extends ApplianceListener<OptionLinks> {
+class UpdateLinksListener extends ApplianceListener<OptionLinks> {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        getAppliance().setServerLinks(event.getPlayer());
+        this.getAppliance().setServerLinks(event.getPlayer());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java

@@ -1,18 +1,19 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-public class ChangePackCommand extends ApplianceCommand.PlayerChecked<PackSelect> {
+class ChangePackCommand extends ApplianceCommand.PlayerChecked<PackSelect> {
     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());
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfiguration.java

@@ -1,6 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.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<PackSelect> {
     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.itemName(Component.text(this.id.toString()));
-            meta.displayName(Component.text(name(), NamedTextColor.GOLD));
+            meta.displayName(Component.text(this.name(), NamedTextColor.GOLD));
             List<Component> 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<PackSelect> {
         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<Pack> packs) {
         public Optional<Pack> findFromItem(ItemStack itemStack) {
-            return packs.stream()
+            return this.packs.stream()
                 .filter(pack -> pack.equalsItem(itemStack))
                 .findFirst();
         }
     }
-    public record SerializedPackList(List<UUID> packs) {}
+
+    public record SerializedPackList(List<UUID> packs) {
+    }
 
     private final PackList packList;
     private final Gson gson = new GsonBuilder().create();
@@ -61,9 +65,9 @@ public class PackConfiguration extends CachedApplianceSupplier<PackSelect> {
     }
 
     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<PackSelect> {
                 .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<PackSelect> {
     }
 
     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<Pack> getPackList() {
-        return packList.packs();
+        return this.packList.packs();
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfigurationInventory.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.CachedApplianceSupplier;
@@ -58,99 +58,99 @@ public class PackConfigurationInventory extends CachedApplianceSupplier<PackSele
     }
 
     public Inventory getInventory() {
-        return inventory;
+        return this.inventory;
     }
 
     public void handleClick(@Nullable ItemStack clickedItem, int slot, ClickType clickType) {
         if(clickedItem == null) return;
-        if(clickedItem.equals(reset)) reset();
+        if(clickedItem.equals(this.reset)) this.reset();
-        if(clickedItem.equals(save)) apply();
+        if(clickedItem.equals(this.save)) this.apply();
 
         if(slot >= 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 RIGHT -> this.move(pack, true);
-                        case LEFT -> move(pack, false);
+                        case LEFT -> this.move(pack, false);
-                        case MIDDLE -> toggle(pack);
+                        case MIDDLE -> this.toggle(pack);
                     }
                 });
         }
     }
 
     private void move(PackConfiguration.Pack pack, boolean moveToRight) {
-        List<PackConfiguration.Pack> packs = packConfiguration.getPackList();
+        List<PackConfiguration.Pack> 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();
+        InteractSounds.of(this.inventoryOwner).click();
-        draw();
+        this.draw();
     }
 
     private void toggle(PackConfiguration.Pack pack) {
-        if(packConfiguration.getPackList().contains(pack)) {
+        if(this.packConfiguration.getPackList().contains(pack)) {
-            packConfiguration.getPackList().remove(pack);
+            this.packConfiguration.getPackList().remove(pack);
         } else {
-            packConfiguration.getPackList().add(pack);
+            this.packConfiguration.getPackList().add(pack);
         }
 
-        InteractSounds.of(inventoryOwner).click();
+        InteractSounds.of(this.inventoryOwner).click();
-        draw();
+        this.draw();
     }
 
     private void reset() {
-        packConfiguration.getPackList().clear();
+        this.packConfiguration.getPackList().clear();
-        InteractSounds.of(inventoryOwner).delete();
+        InteractSounds.of(this.inventoryOwner).delete();
-        draw();
+        this.draw();
     }
 
     private void apply() {
-        inventoryOwner.closeInventory();
+        this.inventoryOwner.closeInventory();
-        InteractSounds.of(inventoryOwner).success();
+        InteractSounds.of(this.inventoryOwner).success();
-        Bukkit.getScheduler().runTask(Main.instance(), () -> getAppliance().setPack(inventoryOwner, packConfiguration));
+        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);
+        this.inventory.setItem(0, this.packConfiguration.getPackList().isEmpty() ? PlaceholderItems.grayStainedGlassPane : this.reset);
-        IteratorUtil.times(3, () -> inventory.addItem(PlaceholderItems.grayStainedGlassPane));
+        IteratorUtil.times(3, () -> this.inventory.addItem(PlaceholderItems.grayStainedGlassPane));
-        inventory.setItem(4, info);
+        this.inventory.setItem(4, this.info);
-        IteratorUtil.times(3, () -> inventory.addItem(PlaceholderItems.grayStainedGlassPane));
+        IteratorUtil.times(3, () -> this.inventory.addItem(PlaceholderItems.grayStainedGlassPane));
-        inventory.setItem(8, save);
+        this.inventory.setItem(8, this.save);
 
         IteratorUtil.iterateListInGlobal(
             9,
-            getAppliance().availablePacks.packs().stream()
+            this.getAppliance().availablePacks.packs().stream()
-                .filter(pack -> !packConfiguration.getPackList().contains(pack))
+                .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<PackSele
                     })
                     .toList(),
                 9,
-                unusedSlot
+                this.unusedSlot
             ),
-            inventory::setItem
+            this.inventory::setItem
         );
 
     }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelect.java

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.ClosePackInventoryListener;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.ClickPackInventoryListener;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.ClickPackInventoryListener;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.ClosePackInventoryListener;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.SetPacksOnJoinListener;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.SetPacksOnJoinListener;
-import eu.mhsl.craftattack.spawn.appliances.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.resource.ResourcePackInfo;
 import net.kyori.adventure.resource.ResourcePackRequest;
 import net.kyori.adventure.text.Component;
@@ -37,7 +37,7 @@ public class PackSelect extends Appliance {
     public void onEnable() {
         Settings.instance().declareSetting(PackSelectSetting.class);
 
-        List<Map<?, ?>> packs = localConfig().getMapList("packs");
+        List<Map<?, ?>> 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);
+                        this.availablePacks.packs().add(packToAdd);
-                    } catch (Exception e) {
+                    } 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) {

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelectSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.spawn.Main;
-import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.ActionSetting;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.ActionSetting;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.spawn.Main;
 import net.kyori.adventure.resource.ResourcePackInfo;
@@ -12,14 +12,14 @@ import java.security.MessageDigest;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
-public class ResourcePackInfoFactory {
+class ResourcePackInfoFactory {
 
     private static boolean isValidHash(@Nullable String hash) {
         return hash != null && hash.length() == 40;
     }
 
     public static @NotNull CompletableFuture<ResourcePackInfo> 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();

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -10,10 +10,10 @@ public class ClickPackInventoryListener extends ApplianceListener<PackSelect> {
     @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()

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners;
 
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryCloseEvent;
@@ -10,7 +10,7 @@ public class ClosePackInventoryListener extends ApplianceListener<PackSelect> {
     @EventHandler
     public void onClose(InventoryCloseEvent event) {
         if(!(event.getPlayer() instanceof Player player)) return;
-        if(getAppliance().isNotPackInventory(player, event.getInventory())) return;
+        if(this.getAppliance().isNotPackInventory(player, event.getInventory())) return;
-        getAppliance().openInventories.remove(player);
+        this.getAppliance().openInventories.remove(player);
     }
 }

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners;
 
 import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -12,7 +12,7 @@ public class SetPacksOnJoinListener extends ApplianceListener<PackSelect> {
     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()))
         );
     }
 }