Split into api and impl packages

src/client/java/xyz/nucleoid/plasmid/client/mixin/game/space/IntegratedPlayerManagerMixin.java

@@ -5,7 +5,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import xyz.nucleoid.plasmid.game.manager.GameSpaceManager;
+import xyz.nucleoid.plasmid.impl.manager.GameSpaceManager;
 
 @Mixin(IntegratedPlayerManager.class)
 public abstract class IntegratedPlayerManagerMixin {

src/main/java/xyz/nucleoid/plasmid/chat/ChatChannel.java → src/main/java/xyz/nucleoid/plasmid/api/chat/ChatChannel.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.chat;
+package xyz.nucleoid.plasmid.api.chat;
 
 public enum ChatChannel {
     ALL,

src/main/java/xyz/nucleoid/plasmid/chat/HasChatChannel.java → src/main/java/xyz/nucleoid/plasmid/api/chat/HasChatChannel.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.chat;
+package xyz.nucleoid.plasmid.api.chat;
 
 public interface HasChatChannel {
     ChatChannel getChatChannel();

src/main/java/xyz/nucleoid/plasmid/chat/PlasmidMessageTypes.java → src/main/java/xyz/nucleoid/plasmid/api/chat/PlasmidMessageTypes.java

@@ -1,10 +1,10 @@
-package xyz.nucleoid.plasmid.chat;
+package xyz.nucleoid.plasmid.api.chat;
 
 import net.minecraft.network.message.MessageType;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
-import xyz.nucleoid.plasmid.Plasmid;
+import xyz.nucleoid.plasmid.impl.Plasmid;
 
 public final class PlasmidMessageTypes {
     public static final RegistryKey<MessageType> TEAM_CHAT = RegistryKey.of(RegistryKeys.MESSAGE_TYPE, Identifier.of(Plasmid.ID, "team_chat"));

src/main/java/xyz/nucleoid/plasmid/event/GameEvents.java → src/main/java/xyz/nucleoid/plasmid/api/event/GameEvents.java

@@ -1,15 +1,15 @@
-package xyz.nucleoid.plasmid.event;
+package xyz.nucleoid.plasmid.api.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.plasmid.game.GameActivity;
-import xyz.nucleoid.plasmid.game.GameCloseReason;
-import xyz.nucleoid.plasmid.game.GameResult;
-import xyz.nucleoid.plasmid.game.GameSpace;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.GameActivity;
+import xyz.nucleoid.plasmid.api.game.GameCloseReason;
+import xyz.nucleoid.plasmid.api.game.GameResult;
+import xyz.nucleoid.plasmid.api.game.GameSpace;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
 
 import java.util.Set;
 

src/main/java/xyz/nucleoid/plasmid/game/GameActivity.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameActivity.java

@@ -1,6 +1,6 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
 import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.StimulusEvent;
 

src/main/java/xyz/nucleoid/plasmid/game/GameAttachment.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameAttachment.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.util.Identifier;
 

src/main/java/xyz/nucleoid/plasmid/game/GameAttachmentHolder.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameAttachmentHolder.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import org.jetbrains.annotations.Nullable;
 

src/main/java/xyz/nucleoid/plasmid/game/GameBehavior.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameBehavior.java

@@ -1,7 +1,7 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import org.jetbrains.annotations.NotNull;
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
 import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.StimulusEvent;
 

src/main/java/xyz/nucleoid/plasmid/game/GameCloseReason.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameCloseReason.java

@@ -1,10 +1,12 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
+
+import xyz.nucleoid.plasmid.api.event.GameEvents;
 
 /**
  * Represents a reason for a game to close.
  * 
  * <p>To close a game, see {@link GameSpace#close}.
- * <p>To listen for game closure, see {@link xyz.nucleoid.plasmid.event.GameEvents#CLOSING}.
+ * <p>To listen for game closure, see {@link GameEvents#CLOSING}.
  */
 public enum GameCloseReason {
     /**

src/main/java/xyz/nucleoid/plasmid/game/GameLifecycle.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameLifecycle.java

@@ -1,8 +1,8 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.plasmid.game.manager.ManagedGameActivity;
+import xyz.nucleoid.plasmid.impl.manager.ManagedGameActivity;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/xyz/nucleoid/plasmid/game/GameOpenContext.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameOpenContext.java

@@ -1,10 +1,10 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import xyz.nucleoid.fantasy.RuntimeWorldConfig;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
 import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.StimulusEvent;
 

src/main/java/xyz/nucleoid/plasmid/game/GameOpenException.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameOpenException.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;

src/main/java/xyz/nucleoid/plasmid/game/GameOpenProcedure.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameOpenProcedure.java

@@ -1,7 +1,7 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.registry.entry.RegistryEntry;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
 
 /**
  * Holds the logic controlling how a {@link GameSpace} should be opened.

src/main/java/xyz/nucleoid/plasmid/game/GameResources.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameResources.java

@@ -1,6 +1,6 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
-import xyz.nucleoid.plasmid.Plasmid;
+import xyz.nucleoid.plasmid.impl.Plasmid;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/xyz/nucleoid/plasmid/game/GameResult.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameResult.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import com.google.common.base.Preconditions;
 import net.minecraft.text.MutableText;

src/main/java/xyz/nucleoid/plasmid/game/GameSpace.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameSpace.java

@@ -1,14 +1,13 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.fantasy.RuntimeWorldConfig;
-import xyz.nucleoid.plasmid.game.event.GameActivityEvents;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
-import xyz.nucleoid.plasmid.game.player.PlayerSet;
-import xyz.nucleoid.plasmid.game.world.GameSpaceWorlds;
+import xyz.nucleoid.plasmid.api.game.player.PlayerSet;
+import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.world.GameSpaceWorlds;
 
 import java.util.function.Consumer;
 

src/main/java/xyz/nucleoid/plasmid/game/GameSpaceMetadata.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameSpaceMetadata.java

@@ -1,8 +1,8 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
 
 import java.util.UUID;
 

src/main/java/xyz/nucleoid/plasmid/game/GameSpacePlayers.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameSpacePlayers.java

@@ -1,10 +1,11 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.server.network.ServerPlayerEntity;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
-import xyz.nucleoid.plasmid.game.player.JoinIntent;
-import xyz.nucleoid.plasmid.game.player.PlayerOps;
-import xyz.nucleoid.plasmid.game.player.PlayerSet;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.player.GamePlayerJoiner;
+import xyz.nucleoid.plasmid.api.game.player.JoinIntent;
+import xyz.nucleoid.plasmid.api.game.player.PlayerOps;
+import xyz.nucleoid.plasmid.api.game.player.PlayerSet;
 
 import java.util.Collection;
 
@@ -25,7 +26,7 @@ public interface GameSpacePlayers extends PlayerSet {
      * @param intent the intent of the players trying to join, such as whether they want to participate or spectate
      * @return a {@link GameResult} describing whether these players can join this game, or an error if not
      * @see GameSpacePlayers#offer(Collection, JoinIntent)
-     * @see xyz.nucleoid.plasmid.game.player.GamePlayerJoiner
+     * @see GamePlayerJoiner
      */
     GameResult simulateOffer(Collection<ServerPlayerEntity> players, JoinIntent intent);
 
@@ -39,7 +40,7 @@ public interface GameSpacePlayers extends PlayerSet {
      * @param intent the intent of the players trying to join, such as whether they want to participate or spectate
      * @return a {@link GameResult} describing whether these players joined the game, or an error if not
      * @see GamePlayerEvents#OFFER
-     * @see xyz.nucleoid.plasmid.game.player.GamePlayerJoiner
+     * @see GamePlayerJoiner
      */
     GameResult offer(Collection<ServerPlayerEntity> players, JoinIntent intent);
 

src/main/java/xyz/nucleoid/plasmid/game/GameSpaceStatistics.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameSpaceStatistics.java

@@ -1,8 +1,8 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import xyz.nucleoid.plasmid.game.stats.GameStatisticBundle;
+import xyz.nucleoid.plasmid.api.game.stats.GameStatisticBundle;
 
 import java.util.function.BiConsumer;
 

src/main/java/xyz/nucleoid/plasmid/game/GameTexts.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameTexts.java

@@ -1,10 +1,10 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
 
 /**
  * Utility class containing various functions that supply {@link Text} instances.

src/main/java/xyz/nucleoid/plasmid/game/GameType.java → src/main/java/xyz/nucleoid/plasmid/api/game/GameType.java

@@ -1,12 +1,12 @@
-package xyz.nucleoid.plasmid.game;
+package xyz.nucleoid.plasmid.api.game;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
-import xyz.nucleoid.plasmid.registry.TinyRegistry;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.util.TinyRegistry;
 
 import java.util.function.Consumer;
 

src/main/java/xyz/nucleoid/plasmid/game/common/GameResourcePack.java → src/main/java/xyz/nucleoid/plasmid/api/game/common/GameResourcePack.java

@@ -1,24 +1,21 @@
-package xyz.nucleoid.plasmid.game.common;
+package xyz.nucleoid.plasmid.api.game.common;
 
 import com.google.common.hash.Hashing;
-import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
 import eu.pb4.polymer.resourcepack.api.ResourcePackCreator;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.network.packet.s2c.common.ResourcePackRemoveS2CPacket;
 import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import xyz.nucleoid.plasmid.Plasmid;
-import xyz.nucleoid.plasmid.PlasmidConfig;
-import xyz.nucleoid.plasmid.PlasmidWebServer;
-import xyz.nucleoid.plasmid.game.GameActivity;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.impl.Plasmid;
+import xyz.nucleoid.plasmid.impl.PlasmidWebServer;
+import xyz.nucleoid.plasmid.api.game.GameActivity;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.Optional;
 import java.util.UUID;
 

src/main/java/xyz/nucleoid/plasmid/game/common/GameWaitingLobby.java → src/main/java/xyz/nucleoid/plasmid/api/game/common/GameWaitingLobby.java

@@ -1,6 +1,5 @@
-package xyz.nucleoid.plasmid.game.common;
+package xyz.nucleoid.plasmid.api.game.common;
 
-import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.boss.BossBar;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -11,24 +10,24 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.plasmid.game.GameActivity;
-import xyz.nucleoid.plasmid.game.GameResult;
-import xyz.nucleoid.plasmid.game.GameSpace;
-import xyz.nucleoid.plasmid.game.GameTexts;
-import xyz.nucleoid.plasmid.game.common.config.PlayerConfig;
-import xyz.nucleoid.plasmid.game.common.widget.BossBarWidget;
-import xyz.nucleoid.plasmid.game.common.widget.SidebarWidget;
-import xyz.nucleoid.plasmid.game.config.GameConfig;
-import xyz.nucleoid.plasmid.game.event.GameActivityEvents;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
-import xyz.nucleoid.plasmid.game.manager.GameSpaceManager;
-import xyz.nucleoid.plasmid.game.player.JoinOffer;
-import xyz.nucleoid.plasmid.game.player.JoinOfferResult;
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
-import xyz.nucleoid.plasmid.util.compatibility.AfkDisplayCompatibility;
+import xyz.nucleoid.plasmid.api.game.GameSpace;
+import xyz.nucleoid.plasmid.api.game.common.config.PlayerConfig;
+import xyz.nucleoid.plasmid.api.game.common.team.TeamSelectionLobby;
+import xyz.nucleoid.plasmid.api.game.common.widget.BossBarWidget;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
+import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.player.JoinOffer;
+import xyz.nucleoid.plasmid.api.game.player.JoinOfferResult;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.GameActivity;
+import xyz.nucleoid.plasmid.api.game.GameResult;
+import xyz.nucleoid.plasmid.api.game.GameTexts;
+import xyz.nucleoid.plasmid.api.game.common.widget.SidebarWidget;
+import xyz.nucleoid.plasmid.impl.manager.GameSpaceManager;
+import xyz.nucleoid.plasmid.impl.compatibility.AfkDisplayCompatibility;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -39,7 +38,7 @@
  *
  * @see GameWaitingLobby#addTo(GameActivity, PlayerConfig)
  * @see PlayerConfig
- * @see xyz.nucleoid.plasmid.game.common.team.TeamSelectionLobby
+ * @see TeamSelectionLobby
  */
 public final class GameWaitingLobby {
     private static final Text WAITING_TITLE = Text.translatable("text.plasmid.game.waiting_lobby.bar.waiting");

src/main/java/xyz/nucleoid/plasmid/game/common/GlobalWidgets.java → src/main/java/xyz/nucleoid/plasmid/api/game/common/GlobalWidgets.java

@@ -1,16 +1,16 @@
-package xyz.nucleoid.plasmid.game.common;
+package xyz.nucleoid.plasmid.api.game.common;
 
 import net.minecraft.entity.boss.BossBar;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-import xyz.nucleoid.plasmid.game.GameActivity;
-import xyz.nucleoid.plasmid.game.GameSpace;
-import xyz.nucleoid.plasmid.game.common.widget.BossBarWidget;
-import xyz.nucleoid.plasmid.game.common.widget.GameWidget;
-import xyz.nucleoid.plasmid.game.common.widget.ScrollableSidebarWidget;
-import xyz.nucleoid.plasmid.game.common.widget.SidebarWidget;
-import xyz.nucleoid.plasmid.game.event.GameActivityEvents;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.GameSpace;
+import xyz.nucleoid.plasmid.api.game.common.widget.BossBarWidget;
+import xyz.nucleoid.plasmid.api.game.common.widget.GameWidget;
+import xyz.nucleoid.plasmid.api.game.common.widget.ScrollableSidebarWidget;
+import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.GameActivity;
+import xyz.nucleoid.plasmid.api.game.common.widget.SidebarWidget;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/xyz/nucleoid/plasmid/game/common/OldCombat.java → src/main/java/xyz/nucleoid/plasmid/api/game/common/OldCombat.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game.common;
+package xyz.nucleoid.plasmid.api.game.common;
 
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.AttributeModifierSlot;

src/main/java/xyz/nucleoid/plasmid/game/common/config/CombatConfig.java → src/main/java/xyz/nucleoid/plasmid/api/game/common/config/CombatConfig.java

@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.game.common.config;
+package xyz.nucleoid.plasmid.api.game.common.config;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;