diff --git a/.gitmodules b/.gitmodules index 0c014712b..1fdd03343 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "connector/src/main/resources/mappings"] - path = connector/src/main/resources/mappings +[submodule "core/src/main/resources/mappings"] + path = core/src/main/resources/mappings url = https://github.com/GeyserMC/mappings.git -[submodule "connector/src/main/resources/languages"] - path = connector/src/main/resources/languages +[submodule "core/src/main/resources/languages"] + path = core/src/main/resources/languages url = https://github.com/GeyserMC/languages.git diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml index 089fd5b04..8ac38f269 100644 --- a/bootstrap/bungeecord/pom.xml +++ b/bootstrap/bungeecord/pom.xml @@ -13,7 +13,7 @@ org.geysermc - connector + core 1.4.3-SNAPSHOT compile diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml index 4b5b50de9..0e8d922a3 100644 --- a/bootstrap/spigot/pom.xml +++ b/bootstrap/spigot/pom.xml @@ -20,7 +20,7 @@ org.geysermc - connector + core 1.4.3-SNAPSHOT compile diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml index a5582bbe0..db26cc4f0 100644 --- a/bootstrap/sponge/pom.xml +++ b/bootstrap/sponge/pom.xml @@ -13,7 +13,7 @@ org.geysermc - connector + core 1.4.3-SNAPSHOT compile diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml index 64a6f6fee..6a8a35f30 100644 --- a/bootstrap/standalone/pom.xml +++ b/bootstrap/standalone/pom.xml @@ -13,7 +13,7 @@ org.geysermc - connector + core 1.4.3-SNAPSHOT compile diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml index fe984e974..11a805b86 100644 --- a/bootstrap/velocity/pom.xml +++ b/bootstrap/velocity/pom.xml @@ -13,7 +13,7 @@ org.geysermc - connector + core 1.4.3-SNAPSHOT compile diff --git a/connector/src/main/resources/languages b/connector/src/main/resources/languages deleted file mode 160000 index d12420771..000000000 --- a/connector/src/main/resources/languages +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d12420771ea5e13083b3556552298d164767aae9 diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings deleted file mode 160000 index 5b6239f0a..000000000 --- a/connector/src/main/resources/mappings +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b6239f0a43ec9a38d65ed53b8d1bfaf564c1c3b diff --git a/connector/pom.xml b/core/pom.xml similarity index 99% rename from connector/pom.xml rename to core/pom.xml index ec2efc1c9..fd4be59a0 100644 --- a/connector/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ geyser-parent 1.4.3-SNAPSHOT - connector + core 4.9.3 diff --git a/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java b/core/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java rename to core/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/core/src/main/java/org/geysermc/connector/GeyserConnector.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/GeyserConnector.java rename to core/src/main/java/org/geysermc/connector/GeyserConnector.java diff --git a/connector/src/main/java/org/geysermc/connector/GeyserLogger.java b/core/src/main/java/org/geysermc/connector/GeyserLogger.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/GeyserLogger.java rename to core/src/main/java/org/geysermc/connector/GeyserLogger.java diff --git a/connector/src/main/java/org/geysermc/connector/SessionManager.java b/core/src/main/java/org/geysermc/connector/SessionManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/SessionManager.java rename to core/src/main/java/org/geysermc/connector/SessionManager.java diff --git a/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java b/core/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java rename to core/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java diff --git a/connector/src/main/java/org/geysermc/connector/command/CommandExecutor.java b/core/src/main/java/org/geysermc/connector/command/CommandExecutor.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/CommandExecutor.java rename to core/src/main/java/org/geysermc/connector/command/CommandExecutor.java diff --git a/connector/src/main/java/org/geysermc/connector/command/CommandManager.java b/core/src/main/java/org/geysermc/connector/command/CommandManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/CommandManager.java rename to core/src/main/java/org/geysermc/connector/command/CommandManager.java diff --git a/connector/src/main/java/org/geysermc/connector/command/CommandSender.java b/core/src/main/java/org/geysermc/connector/command/CommandSender.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/CommandSender.java rename to core/src/main/java/org/geysermc/connector/command/CommandSender.java diff --git a/connector/src/main/java/org/geysermc/connector/command/GeyserCommand.java b/core/src/main/java/org/geysermc/connector/command/GeyserCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/GeyserCommand.java rename to core/src/main/java/org/geysermc/connector/command/GeyserCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java b/core/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java rename to core/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java diff --git a/connector/src/main/java/org/geysermc/connector/common/AuthType.java b/core/src/main/java/org/geysermc/connector/common/AuthType.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/AuthType.java rename to core/src/main/java/org/geysermc/connector/common/AuthType.java diff --git a/connector/src/main/java/org/geysermc/connector/common/ChatColor.java b/core/src/main/java/org/geysermc/connector/common/ChatColor.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/ChatColor.java rename to core/src/main/java/org/geysermc/connector/common/ChatColor.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java b/core/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java rename to core/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java b/core/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java rename to core/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java b/core/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java rename to core/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java b/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java rename to core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java b/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java rename to core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java b/core/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java rename to core/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java diff --git a/connector/src/main/java/org/geysermc/connector/common/connection/LocalSession.java b/core/src/main/java/org/geysermc/connector/common/connection/LocalSession.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/connection/LocalSession.java rename to core/src/main/java/org/geysermc/connector/common/connection/LocalSession.java diff --git a/connector/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java b/core/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java rename to core/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java diff --git a/connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java b/core/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java rename to core/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java diff --git a/connector/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java b/core/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java rename to core/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java diff --git a/connector/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java b/core/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java rename to core/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java b/core/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java rename to core/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java b/core/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java rename to core/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java diff --git a/connector/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java b/core/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java rename to core/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java diff --git a/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java b/core/src/main/java/org/geysermc/connector/dump/DumpInfo.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java rename to core/src/main/java/org/geysermc/connector/dump/DumpInfo.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java b/core/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java rename to core/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java b/core/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java rename to core/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java b/core/src/main/java/org/geysermc/connector/entity/BoatEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java rename to core/src/main/java/org/geysermc/connector/entity/BoatEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java b/core/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java b/core/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java b/core/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java rename to core/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/core/src/main/java/org/geysermc/connector/entity/Entity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/Entity.java rename to core/src/main/java/org/geysermc/connector/entity/Entity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/EntityDefinition.java b/core/src/main/java/org/geysermc/connector/entity/EntityDefinition.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/EntityDefinition.java rename to core/src/main/java/org/geysermc/connector/entity/EntityDefinition.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java b/core/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java rename to core/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java b/core/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java rename to core/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java b/core/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java b/core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java rename to core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java index c57eaa02a..6339a080d 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java +++ b/core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java @@ -1,56 +1,56 @@ -/* - * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * @author GeyserMC - * @link https://github.com/GeyserMC/Geyser - */ - -package org.geysermc.connector.entity; - -import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; -import com.nukkitx.math.vector.Vector3f; -import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.connector.network.session.GeyserSession; - -import java.util.UUID; - -public class FallingBlockEntity extends Entity { - private final int javaId; - - public FallingBlockEntity(GeyserSession session, long entityId, long geyserId, UUID uuid, Vector3f position, Vector3f motion, float yaw, float pitch, int javaId) { - super(session, entityId, geyserId, uuid, EntityDefinitions.FALLING_BLOCK, position, motion, yaw, pitch, 0f); - this.javaId = javaId; - } - - @Override - protected void initializeMetadata() { - super.initializeMetadata(); - this.dirtyMetadata.put(EntityData.VARIANT, session.getBlockMappings().getBedrockBlockId(javaId)); - } - - @Override - public void setGravity(BooleanEntityMetadata entityMetadata) { - super.setGravity(entityMetadata); - // Set the NO_AI flag based on the no gravity flag to prevent movement - setFlag(EntityFlag.NO_AI, entityMetadata.getPrimitiveValue()); - } -} +/* + * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.connector.entity; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.entity.EntityData; +import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; +import org.geysermc.connector.network.session.GeyserSession; + +import java.util.UUID; + +public class FallingBlockEntity extends Entity { + private final int javaId; + + public FallingBlockEntity(GeyserSession session, long entityId, long geyserId, UUID uuid, Vector3f position, Vector3f motion, float yaw, float pitch, int javaId) { + super(session, entityId, geyserId, uuid, EntityDefinitions.FALLING_BLOCK, position, motion, yaw, pitch, 0f); + this.javaId = javaId; + } + + @Override + protected void initializeMetadata() { + super.initializeMetadata(); + this.dirtyMetadata.put(EntityData.VARIANT, session.getBlockMappings().getBedrockBlockId(javaId)); + } + + @Override + public void setGravity(BooleanEntityMetadata entityMetadata) { + super.setGravity(entityMetadata); + // Set the NO_AI flag based on the no gravity flag to prevent movement + setFlag(EntityFlag.NO_AI, entityMetadata.getPrimitiveValue()); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java b/core/src/main/java/org/geysermc/connector/entity/FireworkEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java rename to core/src/main/java/org/geysermc/connector/entity/FireworkEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java b/core/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java rename to core/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java b/core/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java b/core/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java rename to core/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ItemEntity.java b/core/src/main/java/org/geysermc/connector/entity/ItemEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ItemEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ItemEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java b/core/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java b/core/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java b/core/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java rename to core/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/LightningEntity.java b/core/src/main/java/org/geysermc/connector/entity/LightningEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/LightningEntity.java rename to core/src/main/java/org/geysermc/connector/entity/LightningEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java b/core/src/main/java/org/geysermc/connector/entity/LivingEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java rename to core/src/main/java/org/geysermc/connector/entity/LivingEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java b/core/src/main/java/org/geysermc/connector/entity/MinecartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/MinecartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java b/core/src/main/java/org/geysermc/connector/entity/PaintingEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java rename to core/src/main/java/org/geysermc/connector/entity/PaintingEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java b/core/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java b/core/src/main/java/org/geysermc/connector/entity/TNTEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java rename to core/src/main/java/org/geysermc/connector/entity/TNTEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java b/core/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java b/core/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java b/core/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java rename to core/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/Tickable.java b/core/src/main/java/org/geysermc/connector/entity/Tickable.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/Tickable.java rename to core/src/main/java/org/geysermc/connector/entity/Tickable.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java b/core/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java rename to core/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/TridentEntity.java b/core/src/main/java/org/geysermc/connector/entity/TridentEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/TridentEntity.java rename to core/src/main/java/org/geysermc/connector/entity/TridentEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java b/core/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java rename to core/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java b/core/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java rename to core/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java b/core/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java rename to core/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java b/core/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java rename to core/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java b/core/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java rename to core/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java b/core/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java rename to core/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/BatEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/BatEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/BatEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/BatEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/MobEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/MobEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/MobEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/MobEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java b/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java rename to core/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java b/core/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java b/core/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java b/core/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java rename to core/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java b/core/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java b/core/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java b/core/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/Container.java b/core/src/main/java/org/geysermc/connector/inventory/Container.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/Container.java rename to core/src/main/java/org/geysermc/connector/inventory/Container.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java b/core/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java b/core/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java rename to core/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java b/core/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java rename to core/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java b/core/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java rename to core/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/Inventory.java b/core/src/main/java/org/geysermc/connector/inventory/Inventory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/Inventory.java rename to core/src/main/java/org/geysermc/connector/inventory/Inventory.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/LecternContainer.java b/core/src/main/java/org/geysermc/connector/inventory/LecternContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/LecternContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/LecternContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java b/core/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java b/core/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java rename to core/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java diff --git a/connector/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java b/core/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java rename to core/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java diff --git a/connector/src/main/java/org/geysermc/connector/metrics/Metrics.java b/core/src/main/java/org/geysermc/connector/metrics/Metrics.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/metrics/Metrics.java rename to core/src/main/java/org/geysermc/connector/metrics/Metrics.java diff --git a/connector/src/main/java/org/geysermc/connector/network/CIDRMatcher.java b/core/src/main/java/org/geysermc/connector/network/CIDRMatcher.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/CIDRMatcher.java rename to core/src/main/java/org/geysermc/connector/network/CIDRMatcher.java diff --git a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java b/core/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java rename to core/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java b/core/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java rename to core/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java b/core/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java rename to core/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java diff --git a/connector/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java b/core/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java rename to core/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java rename to core/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java rename to core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java b/core/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java rename to core/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java b/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java rename to core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java b/core/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java rename to core/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java b/core/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java b/core/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java b/core/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java rename to core/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java b/core/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java rename to core/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java rename to core/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/Translator.java b/core/src/main/java/org/geysermc/connector/network/translators/Translator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/Translator.java rename to core/src/main/java/org/geysermc/connector/network/translators/Translator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java index 24af60e6c..666c7548b 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java +++ b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java @@ -1,66 +1,66 @@ -/* - * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * @author GeyserMC - * @link https://github.com/GeyserMC/Geyser - */ - -package org.geysermc.connector.network.translators.bedrock; - -import com.nukkitx.math.vector.Vector3i; -import com.nukkitx.protocol.bedrock.packet.BlockPickRequestPacket; -import org.geysermc.connector.entity.EntityDefinitions; -import org.geysermc.connector.entity.ItemFrameEntity; -import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.PacketTranslator; -import org.geysermc.connector.network.translators.Translator; -import org.geysermc.connector.network.translators.world.block.BlockStateValues; -import org.geysermc.connector.registry.BlockRegistries; -import org.geysermc.connector.utils.InventoryUtils; - -@Translator(packet = BlockPickRequestPacket.class) -public class BedrockBlockPickRequestTranslator extends PacketTranslator { - - @Override - public void translate(GeyserSession session, BlockPickRequestPacket packet) { - Vector3i vector = packet.getBlockPosition(); - int blockToPick = session.getConnector().getWorldManager().getBlockAt(session, vector.getX(), vector.getY(), vector.getZ()); - - // Block is air - chunk caching is probably off - if (blockToPick == BlockStateValues.JAVA_AIR_ID) { - // Check for an item frame since the client thinks that's a block when it's an entity in Java - ItemFrameEntity entity = ItemFrameEntity.getItemFrameEntity(session, packet.getBlockPosition()); - if (entity != null) { - // Check to see if the item frame has an item in it first - if (entity.getHeldItem() != null && entity.getHeldItem().getId() != 0) { - // Grab the item in the frame - InventoryUtils.findOrCreateItem(session, entity.getHeldItem()); - } else { - // Grab the frame as the item - InventoryUtils.findOrCreateItem(session, entity.getDefinition() == EntityDefinitions.GLOW_ITEM_FRAME ? "minecraft:glow_item_frame" : "minecraft:item_frame"); - } - } - return; - } - - InventoryUtils.findOrCreateItem(session, BlockRegistries.JAVA_BLOCKS.get(blockToPick).getPickItem()); - } -} +/* + * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.connector.network.translators.bedrock; + +import com.nukkitx.math.vector.Vector3i; +import com.nukkitx.protocol.bedrock.packet.BlockPickRequestPacket; +import org.geysermc.connector.entity.EntityDefinitions; +import org.geysermc.connector.entity.ItemFrameEntity; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; +import org.geysermc.connector.network.translators.world.block.BlockStateValues; +import org.geysermc.connector.registry.BlockRegistries; +import org.geysermc.connector.utils.InventoryUtils; + +@Translator(packet = BlockPickRequestPacket.class) +public class BedrockBlockPickRequestTranslator extends PacketTranslator { + + @Override + public void translate(GeyserSession session, BlockPickRequestPacket packet) { + Vector3i vector = packet.getBlockPosition(); + int blockToPick = session.getConnector().getWorldManager().getBlockAt(session, vector.getX(), vector.getY(), vector.getZ()); + + // Block is air - chunk caching is probably off + if (blockToPick == BlockStateValues.JAVA_AIR_ID) { + // Check for an item frame since the client thinks that's a block when it's an entity in Java + ItemFrameEntity entity = ItemFrameEntity.getItemFrameEntity(session, packet.getBlockPosition()); + if (entity != null) { + // Check to see if the item frame has an item in it first + if (entity.getHeldItem() != null && entity.getHeldItem().getId() != 0) { + // Grab the item in the frame + InventoryUtils.findOrCreateItem(session, entity.getHeldItem()); + } else { + // Grab the frame as the item + InventoryUtils.findOrCreateItem(session, entity.getDefinition() == EntityDefinitions.GLOW_ITEM_FRAME ? "minecraft:glow_item_frame" : "minecraft:item_frame"); + } + } + return; + } + + InventoryUtils.findOrCreateItem(session, BlockRegistries.JAVA_BLOCKS.get(blockToPick).getPickItem()); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBookEditTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBookEditTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBookEditTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBookEditTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemFrameDropItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemFrameDropItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemFrameDropItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemFrameDropItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemStackRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemStackRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemStackRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockItemStackRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLecternUpdateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLecternUpdateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLecternUpdateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLecternUpdateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMapInfoRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMapInfoRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMapInfoRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMapInfoRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMobEquipmentTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMobEquipmentTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMobEquipmentTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMobEquipmentTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMoveEntityAbsoluteTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMoveEntityAbsoluteTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMoveEntityAbsoluteTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMoveEntityAbsoluteTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPlayerInputTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPlayerInputTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPlayerInputTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPlayerInputTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java b/core/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java rename to core/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java b/core/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java rename to core/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java b/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java rename to core/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java b/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java rename to core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java b/core/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/Potion.java b/core/src/main/java/org/geysermc/connector/network/translators/item/Potion.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/Potion.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/Potion.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java b/core/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java b/core/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginDisconnectTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginDisconnectTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginDisconnectTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginDisconnectTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerCloseTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerCloseTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerCloseTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerCloseTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaStopSoundTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaStopSoundTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaStopSoundTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaStopSoundTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java b/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java rename to core/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java b/core/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java b/core/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java b/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java b/core/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java b/core/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java b/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java b/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java rename to core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java diff --git a/connector/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java b/core/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java rename to core/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java diff --git a/connector/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java b/core/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java rename to core/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java b/core/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java b/core/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/BlockRegistries.java b/core/src/main/java/org/geysermc/connector/registry/BlockRegistries.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/BlockRegistries.java rename to core/src/main/java/org/geysermc/connector/registry/BlockRegistries.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/MappedRegistry.java b/core/src/main/java/org/geysermc/connector/registry/MappedRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/MappedRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/MappedRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/Registries.java b/core/src/main/java/org/geysermc/connector/registry/Registries.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/Registries.java rename to core/src/main/java/org/geysermc/connector/registry/Registries.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/Registry.java b/core/src/main/java/org/geysermc/connector/registry/Registry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/Registry.java rename to core/src/main/java/org/geysermc/connector/registry/Registry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java b/core/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java b/core/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java b/core/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java rename to core/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/EnchantmentRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/EnchantmentRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/EnchantmentRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/EnchantmentRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/MultiResourceRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/MultiResourceRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/MultiResourceRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/MultiResourceRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/NbtRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/NbtRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/NbtRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/NbtRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/ParticleTypesRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/ParticleTypesRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/ParticleTypesRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/ParticleTypesRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/PotionMixRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/PotionMixRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/PotionMixRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/PotionMixRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/RegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/RegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/RegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/RegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/RegistryLoaders.java b/core/src/main/java/org/geysermc/connector/registry/loader/RegistryLoaders.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/RegistryLoaders.java rename to core/src/main/java/org/geysermc/connector/registry/loader/RegistryLoaders.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/SoundEventsRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/SoundEventsRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/SoundEventsRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/SoundEventsRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/SoundHandlerRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/SoundHandlerRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/SoundHandlerRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/SoundHandlerRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/loader/SoundRegistryLoader.java b/core/src/main/java/org/geysermc/connector/registry/loader/SoundRegistryLoader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/loader/SoundRegistryLoader.java rename to core/src/main/java/org/geysermc/connector/registry/loader/SoundRegistryLoader.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java rename to core/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java rename to core/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java b/core/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java rename to core/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java b/core/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java rename to core/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java b/core/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java rename to core/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java b/core/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java rename to core/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java b/core/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java rename to core/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java b/core/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java rename to core/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java b/core/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java rename to core/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java b/core/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java rename to core/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java b/core/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java rename to core/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java b/core/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java rename to core/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/Objective.java b/core/src/main/java/org/geysermc/connector/scoreboard/Objective.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/Objective.java rename to core/src/main/java/org/geysermc/connector/scoreboard/Objective.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/Score.java b/core/src/main/java/org/geysermc/connector/scoreboard/Score.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/Score.java rename to core/src/main/java/org/geysermc/connector/scoreboard/Score.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java b/core/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java rename to core/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java b/core/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java rename to core/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/Team.java b/core/src/main/java/org/geysermc/connector/scoreboard/Team.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/Team.java rename to core/src/main/java/org/geysermc/connector/scoreboard/Team.java diff --git a/connector/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java b/core/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java rename to core/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java diff --git a/connector/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java b/core/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java rename to core/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java diff --git a/connector/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java b/core/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java rename to core/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java b/core/src/main/java/org/geysermc/connector/skin/SkinManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/skin/SkinManager.java rename to core/src/main/java/org/geysermc/connector/skin/SkinManager.java diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java b/core/src/main/java/org/geysermc/connector/skin/SkinProvider.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java rename to core/src/main/java/org/geysermc/connector/skin/SkinProvider.java diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java b/core/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java rename to core/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/AttributeUtils.java b/core/src/main/java/org/geysermc/connector/utils/AttributeUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/AttributeUtils.java rename to core/src/main/java/org/geysermc/connector/utils/AttributeUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/Axis.java b/core/src/main/java/org/geysermc/connector/utils/Axis.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/Axis.java rename to core/src/main/java/org/geysermc/connector/utils/Axis.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java b/core/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java rename to core/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java b/core/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java rename to core/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java b/core/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java rename to core/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java b/core/src/main/java/org/geysermc/connector/utils/BlockUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java rename to core/src/main/java/org/geysermc/connector/utils/BlockUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java b/core/src/main/java/org/geysermc/connector/utils/ChunkUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java rename to core/src/main/java/org/geysermc/connector/utils/ChunkUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/Constants.java b/core/src/main/java/org/geysermc/connector/utils/Constants.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/Constants.java rename to core/src/main/java/org/geysermc/connector/utils/Constants.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/CooldownUtils.java b/core/src/main/java/org/geysermc/connector/utils/CooldownUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/CooldownUtils.java rename to core/src/main/java/org/geysermc/connector/utils/CooldownUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java b/core/src/main/java/org/geysermc/connector/utils/DimensionUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java rename to core/src/main/java/org/geysermc/connector/utils/DimensionUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/Direction.java b/core/src/main/java/org/geysermc/connector/utils/Direction.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/Direction.java rename to core/src/main/java/org/geysermc/connector/utils/Direction.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/DockerCheck.java b/core/src/main/java/org/geysermc/connector/utils/DockerCheck.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/DockerCheck.java rename to core/src/main/java/org/geysermc/connector/utils/DockerCheck.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java b/core/src/main/java/org/geysermc/connector/utils/EffectUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java rename to core/src/main/java/org/geysermc/connector/utils/EffectUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java b/core/src/main/java/org/geysermc/connector/utils/EntityUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java rename to core/src/main/java/org/geysermc/connector/utils/EntityUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/FileUtils.java b/core/src/main/java/org/geysermc/connector/utils/FileUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/FileUtils.java rename to core/src/main/java/org/geysermc/connector/utils/FileUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/FireworkColor.java b/core/src/main/java/org/geysermc/connector/utils/FireworkColor.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/FireworkColor.java rename to core/src/main/java/org/geysermc/connector/utils/FireworkColor.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/GameRule.java b/core/src/main/java/org/geysermc/connector/utils/GameRule.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/GameRule.java rename to core/src/main/java/org/geysermc/connector/utils/GameRule.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java b/core/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java rename to core/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java b/core/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java rename to core/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java b/core/src/main/java/org/geysermc/connector/utils/InventoryUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java rename to core/src/main/java/org/geysermc/connector/utils/InventoryUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/ItemUtils.java b/core/src/main/java/org/geysermc/connector/utils/ItemUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/ItemUtils.java rename to core/src/main/java/org/geysermc/connector/utils/ItemUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/LanguageUtils.java b/core/src/main/java/org/geysermc/connector/utils/LanguageUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/LanguageUtils.java rename to core/src/main/java/org/geysermc/connector/utils/LanguageUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java b/core/src/main/java/org/geysermc/connector/utils/LocaleUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java rename to core/src/main/java/org/geysermc/connector/utils/LocaleUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java b/core/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java rename to core/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/MapColor.java b/core/src/main/java/org/geysermc/connector/utils/MapColor.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/MapColor.java rename to core/src/main/java/org/geysermc/connector/utils/MapColor.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/MathUtils.java b/core/src/main/java/org/geysermc/connector/utils/MathUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/MathUtils.java rename to core/src/main/java/org/geysermc/connector/utils/MathUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/NewsHandler.java b/core/src/main/java/org/geysermc/connector/utils/NewsHandler.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/NewsHandler.java rename to core/src/main/java/org/geysermc/connector/utils/NewsHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/PaintingType.java b/core/src/main/java/org/geysermc/connector/utils/PaintingType.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/PaintingType.java rename to core/src/main/java/org/geysermc/connector/utils/PaintingType.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/PistonBehavior.java b/core/src/main/java/org/geysermc/connector/utils/PistonBehavior.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/PistonBehavior.java rename to core/src/main/java/org/geysermc/connector/utils/PistonBehavior.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java b/core/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java rename to core/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java b/core/src/main/java/org/geysermc/connector/utils/ResourcePack.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java rename to core/src/main/java/org/geysermc/connector/utils/ResourcePack.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java b/core/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java rename to core/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java b/core/src/main/java/org/geysermc/connector/utils/SettingsUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java rename to core/src/main/java/org/geysermc/connector/utils/SettingsUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/SignUtils.java b/core/src/main/java/org/geysermc/connector/utils/SignUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/SignUtils.java rename to core/src/main/java/org/geysermc/connector/utils/SignUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/SoundUtils.java b/core/src/main/java/org/geysermc/connector/utils/SoundUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/SoundUtils.java rename to core/src/main/java/org/geysermc/connector/utils/SoundUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java b/core/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java rename to core/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/WebUtils.java b/core/src/main/java/org/geysermc/connector/utils/WebUtils.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/WebUtils.java rename to core/src/main/java/org/geysermc/connector/utils/WebUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java b/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java rename to core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java b/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java rename to core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java b/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java rename to core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java b/core/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java rename to core/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java b/core/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java rename to core/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java diff --git a/connector/src/main/java/org/geysermc/connector/utils/collections/package-info.java b/core/src/main/java/org/geysermc/connector/utils/collections/package-info.java similarity index 100% rename from connector/src/main/java/org/geysermc/connector/utils/collections/package-info.java rename to core/src/main/java/org/geysermc/connector/utils/collections/package-info.java diff --git a/connector/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/core/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from connector/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to core/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/connector/src/main/resources/bedrock/biome_definitions.dat b/core/src/main/resources/bedrock/biome_definitions.dat similarity index 100% rename from connector/src/main/resources/bedrock/biome_definitions.dat rename to core/src/main/resources/bedrock/biome_definitions.dat diff --git a/connector/src/main/resources/bedrock/block_palette.1_17_30.nbt b/core/src/main/resources/bedrock/block_palette.1_17_30.nbt similarity index 100% rename from connector/src/main/resources/bedrock/block_palette.1_17_30.nbt rename to core/src/main/resources/bedrock/block_palette.1_17_30.nbt diff --git a/connector/src/main/resources/bedrock/block_palette.1_17_40.nbt b/core/src/main/resources/bedrock/block_palette.1_17_40.nbt similarity index 100% rename from connector/src/main/resources/bedrock/block_palette.1_17_40.nbt rename to core/src/main/resources/bedrock/block_palette.1_17_40.nbt diff --git a/connector/src/main/resources/bedrock/creative_items.1_17_30.json b/core/src/main/resources/bedrock/creative_items.1_17_30.json similarity index 100% rename from connector/src/main/resources/bedrock/creative_items.1_17_30.json rename to core/src/main/resources/bedrock/creative_items.1_17_30.json diff --git a/connector/src/main/resources/bedrock/creative_items.1_17_40.json b/core/src/main/resources/bedrock/creative_items.1_17_40.json similarity index 100% rename from connector/src/main/resources/bedrock/creative_items.1_17_40.json rename to core/src/main/resources/bedrock/creative_items.1_17_40.json diff --git a/connector/src/main/resources/bedrock/entity_identifiers.dat b/core/src/main/resources/bedrock/entity_identifiers.dat similarity index 100% rename from connector/src/main/resources/bedrock/entity_identifiers.dat rename to core/src/main/resources/bedrock/entity_identifiers.dat diff --git a/connector/src/main/resources/bedrock/runtime_item_states.1_17_30.json b/core/src/main/resources/bedrock/runtime_item_states.1_17_30.json similarity index 100% rename from connector/src/main/resources/bedrock/runtime_item_states.1_17_30.json rename to core/src/main/resources/bedrock/runtime_item_states.1_17_30.json diff --git a/connector/src/main/resources/bedrock/runtime_item_states.1_17_40.json b/core/src/main/resources/bedrock/runtime_item_states.1_17_40.json similarity index 100% rename from connector/src/main/resources/bedrock/runtime_item_states.1_17_40.json rename to core/src/main/resources/bedrock/runtime_item_states.1_17_40.json diff --git a/connector/src/main/resources/bedrock/skin/geometry.humanoid.customskull.json b/core/src/main/resources/bedrock/skin/geometry.humanoid.customskull.json similarity index 100% rename from connector/src/main/resources/bedrock/skin/geometry.humanoid.customskull.json rename to core/src/main/resources/bedrock/skin/geometry.humanoid.customskull.json diff --git a/connector/src/main/resources/bedrock/skin/geometry.humanoid.ears.json b/core/src/main/resources/bedrock/skin/geometry.humanoid.ears.json similarity index 100% rename from connector/src/main/resources/bedrock/skin/geometry.humanoid.ears.json rename to core/src/main/resources/bedrock/skin/geometry.humanoid.ears.json diff --git a/connector/src/main/resources/bedrock/skin/geometry.humanoid.earsSlim.json b/core/src/main/resources/bedrock/skin/geometry.humanoid.earsSlim.json similarity index 100% rename from connector/src/main/resources/bedrock/skin/geometry.humanoid.earsSlim.json rename to core/src/main/resources/bedrock/skin/geometry.humanoid.earsSlim.json diff --git a/connector/src/main/resources/bedrock/skin/skin_alex.png b/core/src/main/resources/bedrock/skin/skin_alex.png similarity index 100% rename from connector/src/main/resources/bedrock/skin/skin_alex.png rename to core/src/main/resources/bedrock/skin/skin_alex.png diff --git a/connector/src/main/resources/bedrock/skin/skin_steve.png b/core/src/main/resources/bedrock/skin/skin_steve.png similarity index 100% rename from connector/src/main/resources/bedrock/skin/skin_steve.png rename to core/src/main/resources/bedrock/skin/skin_steve.png diff --git a/connector/src/main/resources/config.yml b/core/src/main/resources/config.yml similarity index 100% rename from connector/src/main/resources/config.yml rename to core/src/main/resources/config.yml diff --git a/core/src/main/resources/languages b/core/src/main/resources/languages new file mode 160000 index 000000000..1138a6462 --- /dev/null +++ b/core/src/main/resources/languages @@ -0,0 +1 @@ +Subproject commit 1138a64627dec66fdb7f33c922ff6cd5636ec30a diff --git a/core/src/main/resources/mappings b/core/src/main/resources/mappings new file mode 160000 index 000000000..7ff1b6567 --- /dev/null +++ b/core/src/main/resources/mappings @@ -0,0 +1 @@ +Subproject commit 7ff1b6567b56c7b0b8e28786b9bbc30abfaededf diff --git a/connector/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java b/core/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java similarity index 100% rename from connector/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java rename to core/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java diff --git a/connector/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java b/core/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java similarity index 100% rename from connector/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java rename to core/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java diff --git a/pom.xml b/pom.xml index ee2b90b56..99a4b3374 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ ap bootstrap common - connector + core