The Great Refactor Part 1 - connector -> core

2024-12-24 23:30:22 +01:00 · 2021-11-20 13:56:40 -06:00 · 2021-11-20 13:56:40 -06:00 · 0b5009b415
Commit 0b5009b415
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
-[submodule "connector/src/main/resources/mappings"]
+[submodule "core/src/main/resources/mappings"]
-	path = connector/src/main/resources/mappings
+	path = core/src/main/resources/mappings
 	url = https://github.com/GeyserMC/mappings.git
-[submodule "connector/src/main/resources/languages"]
+[submodule "core/src/main/resources/languages"]
-	path = connector/src/main/resources/languages
+	path = core/src/main/resources/languages
 	url = https://github.com/GeyserMC/languages.git
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@ -13,7 +13,7 @@
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
            <version>1.4.3-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@ -20,7 +20,7 @@
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
            <version>1.4.3-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@ -13,7 +13,7 @@
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
            <version>1.4.3-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@ -13,7 +13,7 @@
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
            <version>1.4.3-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@ -13,7 +13,7 @@
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
            <version>1.4.3-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
--- a/connector/src/main/resources/languages
+++ b/connector/src/main/resources/languages
@ -1 +0,0 @@
 Subproject commit d12420771ea5e13083b3556552298d164767aae9
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@ -1 +0,0 @@
 Subproject commit 5b6239f0a43ec9a38d65ed53b8d1bfaf564c1c3b
--- a/connector/pom.xml
+++ b/connector/pom.xml
@ -8,7 +8,7 @@
        <artifactId>geyser-parent</artifactId>
        <version>1.4.3-SNAPSHOT</version>
    </parent>
-    <artifactId>connector</artifactId>
+    <artifactId>core</artifactId>
    <properties>
        <adventure.version>4.9.3</adventure.version>
--- a/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
+++ b/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
--- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
+++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
--- a/connector/src/main/java/org/geysermc/connector/GeyserLogger.java
+++ b/connector/src/main/java/org/geysermc/connector/GeyserLogger.java
--- a/connector/src/main/java/org/geysermc/connector/SessionManager.java
+++ b/connector/src/main/java/org/geysermc/connector/SessionManager.java
--- a/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java
+++ b/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java
--- a/connector/src/main/java/org/geysermc/connector/command/CommandExecutor.java
+++ b/connector/src/main/java/org/geysermc/connector/command/CommandExecutor.java
--- a/connector/src/main/java/org/geysermc/connector/command/CommandManager.java
+++ b/connector/src/main/java/org/geysermc/connector/command/CommandManager.java
--- a/connector/src/main/java/org/geysermc/connector/command/CommandSender.java
+++ b/connector/src/main/java/org/geysermc/connector/command/CommandSender.java
--- a/connector/src/main/java/org/geysermc/connector/command/GeyserCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/GeyserCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
--- a/connector/src/main/java/org/geysermc/connector/common/AuthType.java
+++ b/connector/src/main/java/org/geysermc/connector/common/AuthType.java
--- a/connector/src/main/java/org/geysermc/connector/common/ChatColor.java
+++ b/connector/src/main/java/org/geysermc/connector/common/ChatColor.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java
--- a/connector/src/main/java/org/geysermc/connector/common/connection/LocalSession.java
+++ b/connector/src/main/java/org/geysermc/connector/common/connection/LocalSession.java
--- a/connector/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java
+++ b/connector/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java
--- a/connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java
+++ b/connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java
--- a/connector/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java
+++ b/connector/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java
--- a/connector/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java
+++ b/connector/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java
--- a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java
+++ b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java
--- a/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java
+++ b/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java
--- a/connector/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java
+++ b/connector/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java
--- a/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
+++ b/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
--- a/connector/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/Entity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/EntityDefinition.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/EntityDefinition.java
--- a/connector/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java
--- a/connector/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ItemEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ItemEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/LightningEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/LightningEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/Tickable.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/Tickable.java
--- a/connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/TridentEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/TridentEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java
--- a/connector/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java
--- a/connector/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java
--- a/connector/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java
--- a/connector/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/BatEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/BatEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/MobEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/MobEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java
--- a/connector/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java
--- a/Mehr anzeigen
+++ b/Mehr anzeigen
		`@ -1 +0,0 @@`
			`Subproject commit d12420771ea5e13083b3556552298d164767aae9`
		`@ -1 +0,0 @@`
			`Subproject commit 5b6239f0a43ec9a38d65ed53b8d1bfaf564c1c3b`