Consistent packages

MrSlimeDiamond · MrSlimeDiamond · commit 1ca8a398703b · 2023-07-06T11:15:32.000+12:00
diff --git a/GalliumLib b/GalliumLib
@@ -1 +1 @@
-Subproject commit 0e2db7a7b627ff8d2a786659e7b1705b7030d440
+Subproject commit 6ec8f274b9d50bbdc64ce2339767ff504aeb58db
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
@@ -101,7 +101,7 @@
 import net.minecraft.server.commands.WorldBorderCommand;
 import net.minecraft.server.commands.data.DataCommands;
 import net.minecraft.server.level.ServerPlayer;
-import org.galliumpowered.api.chat.Colors;
+import org.galliumpowered.chat.Colors;
 import org.galliumpowered.util.TextTransformer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -158,7 +158,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.galliumpowered.Gallium;
 import org.galliumpowered.Mod;
-import org.galliumpowered.api.event.system.ServerShutdownEvent;
+import org.galliumpowered.event.system.ServerShutdownEvent;
 import org.apache.commons.lang3.Validate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -67,7 +67,7 @@
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.WorldData;
 import org.galliumpowered.Gallium;
-import org.galliumpowered.api.event.system.ServerStartEvent;
+import org.galliumpowered.event.system.ServerStartEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -27,8 +27,8 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import org.galliumpowered.api.event.player.PlayerBreakBlockEvent;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.event.player.PlayerBreakBlockEvent;
+import org.galliumpowered.world.entity.PlayerImpl;
 import org.galliumpowered.world.block.WorldBlockImpl;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -162,9 +162,9 @@
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.galliumpowered.api.event.player.PlayerChatEvent;
-import org.galliumpowered.api.event.player.PlayerDisconnectEvent;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.event.player.PlayerChatEvent;
+import org.galliumpowered.event.player.PlayerDisconnectEvent;
+import org.galliumpowered.world.entity.PlayerImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -98,8 +98,8 @@
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.Team;
 import org.galliumpowered.Gallium;
-import org.galliumpowered.api.event.player.PlayerJoinEvent;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.event.player.PlayerJoinEvent;
+import org.galliumpowered.world.entity.PlayerImpl;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -37,8 +37,8 @@
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.shapes.CollisionContext;
-import org.galliumpowered.api.event.player.PlayerPlaceBlockEvent;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.event.player.PlayerPlaceBlockEvent;
+import org.galliumpowered.world.entity.PlayerImpl;
 import org.galliumpowered.world.block.BlockImpl;
 
 public class BlockItem extends Item {
diff --git a/src/main/java/org/galliumpowered/Mod.java b/src/main/java/org/galliumpowered/Mod.java
@@ -2,13 +2,13 @@
 
 import net.minecraft.server.MinecraftServer;
 import org.galliumpowered.bridge.BridgeImpl;
-import org.galliumpowered.commandsys.CommandManager;
+import org.galliumpowered.command.CommandManager;
 import org.galliumpowered.database.Database;
 import org.galliumpowered.event.EventDispatcherImpl;
-import org.galliumpowered.eventsys.EventManager;
+import org.galliumpowered.event.EventManager;
 import org.galliumpowered.exceptions.GalliumDatabaseException;
-import org.galliumpowered.permissionsys.GroupManager;
-import org.galliumpowered.permissionsys.PermissionManager;
+import org.galliumpowered.permission.GroupManager;
+import org.galliumpowered.permission.PermissionManager;
 import org.galliumpowered.plugin.PluginManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/org/galliumpowered/ServerImpl.java b/src/main/java/org/galliumpowered/ServerImpl.java
@@ -1,7 +1,7 @@
 package org.galliumpowered;
 
 import org.galliumpowered.world.entity.Player;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.world.entity.PlayerImpl;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/galliumpowered/bridge/BridgeImpl.java b/src/main/java/org/galliumpowered/bridge/BridgeImpl.java
@@ -11,15 +11,15 @@
 import net.minecraft.server.level.ServerPlayer;
 import org.galliumpowered.Gallium;
 import org.galliumpowered.Mod;
-import org.galliumpowered.api.annotations.Args;
-import org.galliumpowered.commandsys.args.ArgsTypeTranslator;
+import org.galliumpowered.annotation.Args;
+import org.galliumpowered.command.args.ArgsTypeTranslator;
 import org.galliumpowered.world.entity.Player;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.world.entity.PlayerImpl;
 import org.galliumpowered.exceptions.CommandException;
-import org.galliumpowered.commandsys.CommandCaller;
-import org.galliumpowered.commandsys.CommandCallerImpl;
-import org.galliumpowered.commandsys.CommandContextImpl;
-import org.galliumpowered.commandsys.MCommand;
+import org.galliumpowered.command.CommandCaller;
+import org.galliumpowered.command.CommandCallerImpl;
+import org.galliumpowered.command.CommandContextImpl;
+import org.galliumpowered.command.MCommand;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
diff --git a/src/main/java/org/galliumpowered/command/CommandCallerImpl.java b/src/main/java/org/galliumpowered/command/CommandCallerImpl.java
@@ -1,8 +1,8 @@
-package org.galliumpowered.commandsys;
+package org.galliumpowered.command;
 
 import net.minecraft.server.level.ServerPlayer;
 import org.galliumpowered.world.entity.Player;
-import org.galliumpowered.api.world.entity.player.PlayerImpl;
+import org.galliumpowered.world.entity.PlayerImpl;
 
 import javax.annotation.Nullable;
 import java.util.Optional;
diff --git a/src/main/java/org/galliumpowered/command/CommandContextImpl.java b/src/main/java/org/galliumpowered/command/CommandContextImpl.java
@@ -1,4 +1,4 @@
-package org.galliumpowered.commandsys;
+package org.galliumpowered.command;
 
 import org.galliumpowered.world.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
diff --git a/src/main/java/org/galliumpowered/command/args/ArgsTypeTranslator.java b/src/main/java/org/galliumpowered/command/args/ArgsTypeTranslator.java
@@ -1,4 +1,4 @@
-package org.galliumpowered.commandsys.args;
+package org.galliumpowered.command.args;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 
diff --git a/src/main/java/org/galliumpowered/event/EventDispatcherImpl.java b/src/main/java/org/galliumpowered/event/EventDispatcherImpl.java
@@ -1,10 +1,6 @@
 package org.galliumpowered.event;
 
 import org.galliumpowered.Gallium;
-import org.galliumpowered.api.event.Event;
-import org.galliumpowered.eventsys.EventDispatcher;
-import org.galliumpowered.eventsys.EventManager;
-import org.galliumpowered.eventsys.MListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java b/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java
@@ -1,10 +1,10 @@
-package org.galliumpowered.api.world.entity.player;
+package org.galliumpowered.world.entity;
 
 import net.kyori.adventure.text.Component;
 import net.minecraft.Util;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameType;
-import org.galliumpowered.api.Gamemode;
+import org.galliumpowered.Gamemode;
 import org.galliumpowered.world.entity.Player;
 import org.galliumpowered.util.TextTransformer;
 
