various changes for team management

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.core;
+package eu.mhsl.craftattack.spawn.core;
 
-import eu.mhsl.craftattack.core.api.client.RepositoryLoader;
-import eu.mhsl.craftattack.core.api.server.HttpServer;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.core.config.Configuration;
+import eu.mhsl.craftattack.spawn.core.api.client.RepositoryLoader;
+import eu.mhsl.craftattack.spawn.core.api.server.HttpServer;
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -16,6 +16,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public final class Main extends JavaPlugin {
+    public static final String projectPackage = "eu.mhsl.craftattack.spawn";
     private static Main instance;
     private static Logger logger;
 
@@ -41,7 +42,7 @@ public final class Main extends JavaPlugin {
         List<String> disabledAppliances = Configuration.pluginConfig.getStringList("disabledAppliances");
 
         Main.logger().info("Initializing reflections...");
-        this.reflections = new Reflections("eu.mhsl.craftattack.spawn");
+        this.reflections = new Reflections(projectPackage);
 
         Main.logger().info("Loading Repositories...");
         this.repositoryLoader = new RepositoryLoader();

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

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.api.client;
+package eu.mhsl.craftattack.spawn.core.api.client;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import org.apache.http.client.utils.URIBuilder;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,7 +12,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.function.Consumer;
 
-@RepositoryLoader.IgnoreRepository
+@RepositoryLoader.Abstraction
 public abstract class HttpRepository extends Repository {
     private final Consumer<URIBuilder> baseUriBuilder;
 

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

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.core.api.client;
+package eu.mhsl.craftattack.spawn.core.api.client;
 
 import com.google.gson.Gson;
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import org.bukkit.Bukkit;
 
 import java.net.URI;

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

@@ -1,5 +1,6 @@
-package eu.mhsl.craftattack.core.api.client;
+package eu.mhsl.craftattack.spawn.core.api.client;
 
+import eu.mhsl.craftattack.spawn.core.Main;
 import org.apache.commons.lang3.NotImplementedException;
 import org.reflections.Reflections;
 
@@ -12,16 +13,19 @@ import java.util.Set;
 public class RepositoryLoader {
     private final List<Repository> repositories;
 
+    /**
+     * Defines a repository as an abstraction and will not be loaded by this RepositoryLoader
+     */
     @Retention(RetentionPolicy.RUNTIME)
-    public @interface IgnoreRepository {
+    public @interface Abstraction {
     }
 
     public RepositoryLoader() {
-        Reflections reflections = new Reflections(this.getClass().getPackageName());
+        Reflections reflections = new Reflections(Main.projectPackage);
         Set<Class<? extends Repository>> repositories = reflections.getSubTypesOf(Repository.class);
 
         this.repositories = repositories.stream()
-            .filter(repository -> !repository.isAnnotationPresent(IgnoreRepository.class))
+            .filter(repository -> !repository.isAnnotationPresent(Abstraction.class))
             .map(repository -> {
                 try {
                     return (Repository) repository.getDeclaredConstructor().newInstance();

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

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

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.core.api.client.repositories;
 
-import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.util.api.EventApiUtil;
+import eu.mhsl.craftattack.spawn.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.core.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.core.util.api.EventApiUtil;
 
 import java.util.UUID;
 

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.core.api.client.repositories;
 
 import com.google.common.reflect.TypeToken;
-import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.spawn.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.core.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.core.util.api.WebsiteApiUtil;
 
 import java.lang.reflect.Type;
 import java.util.List;

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.core.api.client.repositories;
 
-import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.spawn.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.core.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.core.util.api.WebsiteApiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.core.api.client.repositories;
 
-import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.spawn.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.core.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.core.util.api.WebsiteApiUtil;
 
 import java.util.UUID;
 

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.server;
+package eu.mhsl.craftattack.spawn.core.api.server;
 
 import com.google.gson.Gson;
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.core.Main;
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
 import org.bukkit.configuration.ConfigurationSection;
 import spark.Request;
 import spark.Spark;

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.core.appliance;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.api.client.Repository;
-import eu.mhsl.craftattack.core.api.server.HttpServer;
-import eu.mhsl.craftattack.core.config.Configuration;
+import eu.mhsl.craftattack.spawn.core.Main;
+import eu.mhsl.craftattack.spawn.core.api.client.Repository;
+import eu.mhsl.craftattack.spawn.core.api.server.HttpServer;
+import eu.mhsl.craftattack.spawn.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;

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

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.core.appliance;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

core/src/main/java/eu/mhsl/craftattack/spawn/core/appliance/ApplianceListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.core.appliance;
 
 import org.bukkit.event.Listener;
 

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

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.core.appliance;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 
 public class CachedApplianceSupplier<T extends Appliance> implements IApplianceSupplier<T> {
     private final T appliance;

core/src/main/java/eu/mhsl/craftattack/spawn/core/appliance/IApplianceSupplier.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.core.appliance;
 
 public interface IApplianceSupplier<T extends Appliance> {
     T getAppliance();

core/src/main/java/eu/mhsl/craftattack/spawn/core/config/ConfigUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.config;
+package eu.mhsl.craftattack.spawn.core.config;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

core/src/main/java/eu/mhsl/craftattack/spawn/core/config/Configuration.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.config;
+package eu.mhsl.craftattack.spawn.core.config;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/IteratorUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util;
+package eu.mhsl.craftattack.spawn.core.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/NumberUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util;
+package eu.mhsl.craftattack.spawn.core.util;
 
 public class NumberUtil {
     public static double map(double oldValue, double oldMin, double oldMax, double newMin, double newMax) {

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/api/EventApiUtil.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.api;
+package eu.mhsl.craftattack.spawn.core.util.api;
 
-import eu.mhsl.craftattack.core.config.Configuration;
+import eu.mhsl.craftattack.spawn.core.config.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.net.URI;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/api/HttpStatus.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.api;
+package eu.mhsl.craftattack.spawn.core.util.api;
 
 public class HttpStatus {
     public static final int OK = 200;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/api/WebsiteApiUtil.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.api;
+package eu.mhsl.craftattack.spawn.core.util.api;
 
-import eu.mhsl.craftattack.core.config.Configuration;
+import eu.mhsl.craftattack.spawn.core.config.Configuration;
 import org.apache.http.client.utils.URIBuilder;
 import org.bukkit.configuration.ConfigurationSection;
 

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/entity/DisplayVillager.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.util.entity;
+package eu.mhsl.craftattack.spawn.core.util.entity;
 
-import eu.mhsl.craftattack.core.config.ConfigUtil;
-import eu.mhsl.craftattack.core.config.Configuration;
-import eu.mhsl.craftattack.core.util.world.ChunkUtils;
+import eu.mhsl.craftattack.spawn.core.config.ConfigUtil;
+import eu.mhsl.craftattack.spawn.core.config.Configuration;
+import eu.mhsl.craftattack.spawn.core.util.world.ChunkUtils;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/entity/PlayerUtils.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.entity;
+package eu.mhsl.craftattack.spawn.core.util.entity;
 
 import org.bukkit.Material;
 import org.bukkit.Statistic;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/inventory/HeadBuilder.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.inventory;
+package eu.mhsl.craftattack.spawn.core.util.inventory;
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.destroystokyo.paper.profile.ProfileProperty;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/inventory/ItemBuilder.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.inventory;
+package eu.mhsl.craftattack.spawn.core.util.inventory;
 
-import eu.mhsl.craftattack.core.util.text.ComponentUtil;
+import eu.mhsl.craftattack.spawn.core.util.text.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/inventory/PlaceholderItems.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.inventory;
+package eu.mhsl.craftattack.spawn.core.util.inventory;
 
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/listener/DismissInventoryOpenFromHolder.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.listener;
+package eu.mhsl.craftattack.spawn.core.util.listener;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.event.EventHandler;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/listener/PlayerInteractAtEntityEventListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.listener;
+package eu.mhsl.craftattack.spawn.core.util.listener;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/server/Floodgate.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.server;
+package eu.mhsl.craftattack.spawn.core.util.server;
 
 import org.bukkit.entity.Player;
 import org.geysermc.cumulus.form.SimpleForm;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/server/PluginMessage.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.util.server;
+package eu.mhsl.craftattack.spawn.core.util.server;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import org.bukkit.entity.Player;
 
 public class PluginMessage {

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/statistics/NetworkMonitor.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.statistics;
+package eu.mhsl.craftattack.spawn.core.util.statistics;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import net.kyori.adventure.util.Ticks;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitTask;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/statistics/ServerMonitor.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.statistics;
+package eu.mhsl.craftattack.spawn.core.util.statistics;
 
 import org.bukkit.Bukkit;
 

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/ColorUtil.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
-import eu.mhsl.craftattack.core.util.NumberUtil;
+import eu.mhsl.craftattack.spawn.core.util.NumberUtil;
 import net.kyori.adventure.text.format.TextColor;
 
 import java.awt.*;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/ComponentUtil.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
-import eu.mhsl.craftattack.core.util.statistics.NetworkMonitor;
-import eu.mhsl.craftattack.core.util.statistics.ServerMonitor;
+import eu.mhsl.craftattack.spawn.core.util.statistics.NetworkMonitor;
+import eu.mhsl.craftattack.spawn.core.util.statistics.ServerMonitor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/Countdown.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/DataSizeConverter.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
 public class DataSizeConverter {
     public static String convertBytesPerSecond(long bytes) {

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/DisconnectInfo.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
-import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.core.Main;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/NumberAbbreviation.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
 public class NumberAbbreviation {
     public static <T extends Number & Comparable<T>> String abbreviateNumber(T number) {

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/RainbowComponent.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.text;
+package eu.mhsl.craftattack.spawn.core.util.text;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/world/BlockCycle.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.world;
+package eu.mhsl.craftattack.spawn.core.util.world;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/world/ChunkUtils.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.world;
+package eu.mhsl.craftattack.spawn.core.util.world;
 
 import org.bukkit.Chunk;
 import org.bukkit.Location;

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/world/InteractSounds.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.core.util.world;
+package eu.mhsl.craftattack.spawn.core.util.world;
 
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.sound.Sound;

core/src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: spawn
 description: modular base-plugin for mhsl server projects
 version: '0'
 api-version: '1.21'
-main: eu.mhsl.craftattack.core.Main
+main: eu.mhsl.craftattack.spawn.core.Main
 load: POSTWORLD
 prefix: mhsl-spawn