From 2c663e0ee5824e88c571ec679e68d1eab59a72ec Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 20 Nov 2021 17:29:46 -0600 Subject: [PATCH] The Great Refactor Part 3 - Entire project restructure --- .../processor/BlockEntityProcessor.java | 2 +- .../processor/CollisionRemapperProcessor.java | 2 +- .../processor/ItemRemapperProcessor.java | 2 +- .../processor/PacketTranslatorProcessor.java | 2 +- .../processor/SoundHandlerProcessor.java | 2 +- .../bungeecord/GeyserBungeeDumpInfo.java | 2 +- .../bungeecord/GeyserBungeeInjector.java | 8 +- .../platform/bungeecord/GeyserBungeeMain.java | 4 +- .../GeyserBungeePingPassthrough.java | 2 +- .../bungeecord/GeyserBungeePlugin.java | 14 +- .../command/BungeeCommandSender.java | 8 +- .../command/GeyserBungeeCommandExecutor.java | 8 +- .../platform/spigot/GeyserSpigotDumpInfo.java | 2 +- .../platform/spigot/GeyserSpigotInjector.java | 6 +- .../platform/spigot/GeyserSpigotMain.java | 4 +- .../spigot/GeyserSpigotPingPassthrough.java | 2 +- .../platform/spigot/GeyserSpigotPlugin.java | 24 ++-- .../command/GeyserSpigotCommandExecutor.java | 8 +- .../spigot/command/SpigotCommandSender.java | 6 +- .../spigot/world/GeyserPistonListener.java | 10 +- .../GeyserSpigot1_11CraftingListener.java | 6 +- .../world/GeyserSpigotBlockPlaceListener.java | 4 +- .../GeyserSpigot1_12NativeWorldManager.java | 4 +- .../manager/GeyserSpigot1_12WorldManager.java | 4 +- .../GeyserSpigotFallbackWorldManager.java | 4 +- .../GeyserSpigotLegacyNativeWorldManager.java | 2 +- .../GeyserSpigotNativeWorldManager.java | 4 +- .../manager/GeyserSpigotWorldManager.java | 12 +- .../platform/sponge/GeyserSpongeMain.java | 4 +- .../sponge/GeyserSpongePingPassthrough.java | 2 +- .../platform/sponge/GeyserSpongePlugin.java | 10 +- .../command/GeyserSpongeCommandExecutor.java | 10 +- .../standalone/GeyserStandaloneBootstrap.java | 28 ++-- .../standalone/GeyserStandaloneLogger.java | 2 +- .../platform/standalone/LoopbackUtil.java | 8 +- .../standalone/gui/GeyserStandaloneGUI.java | 38 +++--- .../velocity/GeyserVelocityDumpInfo.java | 2 +- .../velocity/GeyserVelocityInjector.java | 6 +- .../platform/velocity/GeyserVelocityMain.java | 4 +- .../GeyserVelocityPingPassthrough.java | 2 +- .../velocity/GeyserVelocityPlugin.java | 16 +-- .../GeyserVelocityCommandExecutor.java | 10 +- .../command/VelocityCommandSender.java | 8 +- .../network/session/GeyserSession.java | 4 +- .../network/session/auth/AuthData.java | 4 +- .../geyser/{utils => }/Constants.java | 2 +- .../geysermc/geyser/FloodgateKeyLoader.java | 10 +- .../{bootstrap => }/GeyserBootstrap.java | 7 +- .../java/org/geysermc/geyser/GeyserImpl.java | 59 ++++----- .../main/IGeyserMain.java => GeyserMain.java} | 8 +- .../geyser/command/CommandExecutor.java | 2 +- .../geyser/command/CommandManager.java | 10 +- .../geyser/command/CommandSender.java | 6 +- .../geyser/command/GeyserCommand.java | 2 +- .../command/defaults/AdvancementsCommand.java | 2 +- .../geyser/command/defaults/DumpCommand.java | 36 +++--- .../geyser/command/defaults/HelpCommand.java | 10 +- .../geyser/command/defaults/ListCommand.java | 6 +- .../command/defaults/OffhandCommand.java | 4 +- .../command/defaults/ReloadCommand.java | 6 +- .../command/defaults/SettingsCommand.java | 4 +- .../command/defaults/StatisticsCommand.java | 2 +- .../geyser/command/defaults/StopCommand.java | 6 +- .../command/defaults/VersionCommand.java | 22 ++-- .../configuration/GeyserConfiguration.java | 9 +- .../GeyserJacksonConfiguration.java | 8 +- .../org/geysermc/geyser/dump/DumpInfo.java | 29 ++++- .../geyser/entity/EntityDefinition.java | 4 +- .../geyser/entity/EntityDefinitions.java | 33 ++--- .../InteractiveTagManager.java | 18 +-- .../entity/factory/BaseEntityFactory.java | 4 +- .../geyser/entity/factory/EntityFactory.java | 2 +- .../factory/ExperienceOrbEntityFactory.java | 4 +- .../entity/factory/PaintingEntityFactory.java | 6 +- .../{ => type}/AbstractArrowEntity.java | 5 +- .../{ => type}/AreaEffectCloudEntity.java | 9 +- .../geyser/entity/{ => type}/BoatEntity.java | 6 +- .../CommandBlockMinecartEntity.java | 5 +- .../DefaultBlockMinecartEntity.java | 5 +- .../entity/{ => type}/EnderCrystalEntity.java | 5 +- .../geyser/entity/{ => type}/Entity.java | 10 +- .../entity/{ => type}/ExpOrbEntity.java | 5 +- .../entity/{ => type}/FallingBlockEntity.java | 5 +- .../entity/{ => type}/FireworkEntity.java | 11 +- .../entity/{ => type}/FishingHookEntity.java | 17 +-- .../{ => type}/FurnaceMinecartEntity.java | 7 +- .../geyser/entity/{ => type}/ItemEntity.java | 9 +- .../entity/{ => type}/ItemFrameEntity.java | 7 +- .../{ => type}/ItemedFireballEntity.java | 5 +- .../entity/{ => type}/LeashKnotEntity.java | 5 +- .../entity/{ => type}/LightningEntity.java | 5 +- .../entity/{ => type}/LivingEntity.java | 9 +- .../entity/{ => type}/MinecartEntity.java | 5 +- .../entity/{ => type}/PaintingEntity.java | 7 +- .../{ => type}/SpawnerMinecartEntity.java | 7 +- .../geyser/entity/{ => type}/TNTEntity.java | 6 +- .../entity/{ => type}/ThrowableEntity.java | 7 +- .../{ => type}/ThrowableItemEntity.java | 5 +- .../entity/{ => type}/ThrownPotionEntity.java | 7 +- .../geyser/entity/{ => type}/Tickable.java | 2 +- .../entity/{ => type}/TippedArrowEntity.java | 7 +- .../entity/{ => type}/TridentEntity.java | 5 +- .../entity/{ => type}/WitherSkullEntity.java | 6 +- .../{ => type}/living/AbstractFishEntity.java | 4 +- .../{ => type}/living/AgeableEntity.java | 4 +- .../{ => type}/living/AmbientEntity.java | 4 +- .../{ => type}/living/ArmorStandEntity.java | 6 +- .../entity/{ => type}/living/BatEntity.java | 4 +- .../{ => type}/living/CreatureEntity.java | 4 +- .../{ => type}/living/FlyingEntity.java | 4 +- .../{ => type}/living/GlowSquidEntity.java | 4 +- .../entity/{ => type}/living/GolemEntity.java | 4 +- .../{ => type}/living/IronGolemEntity.java | 4 +- .../{ => type}/living/MagmaCubeEntity.java | 4 +- .../entity/{ => type}/living/MobEntity.java | 6 +- .../entity/{ => type}/living/SlimeEntity.java | 4 +- .../{ => type}/living/SnowGolemEntity.java | 4 +- .../entity/{ => type}/living/SquidEntity.java | 8 +- .../entity/{ => type}/living/WaterEntity.java | 4 +- .../living/animal/AnimalEntity.java | 6 +- .../living/animal/AxolotlEntity.java | 4 +- .../{ => type}/living/animal/BeeEntity.java | 4 +- .../living/animal/ChickenEntity.java | 4 +- .../{ => type}/living/animal/FoxEntity.java | 4 +- .../{ => type}/living/animal/GoatEntity.java | 4 +- .../living/animal/HoglinEntity.java | 6 +- .../living/animal/MooshroomEntity.java | 4 +- .../living/animal/OcelotEntity.java | 4 +- .../{ => type}/living/animal/PandaEntity.java | 4 +- .../{ => type}/living/animal/PigEntity.java | 4 +- .../living/animal/PolarBearEntity.java | 4 +- .../living/animal/PufferFishEntity.java | 6 +- .../living/animal/RabbitEntity.java | 4 +- .../{ => type}/living/animal/SheepEntity.java | 5 +- .../living/animal/StriderEntity.java | 6 +- .../living/animal/TropicalFishEntity.java | 6 +- .../living/animal/TurtleEntity.java | 4 +- .../animal/horse/AbstractHorseEntity.java | 6 +- .../animal/horse/ChestedHorseEntity.java | 4 +- .../living/animal/horse/HorseEntity.java | 4 +- .../living/animal/horse/LlamaEntity.java | 4 +- .../animal/horse/TraderLlamaEntity.java | 4 +- .../living/animal/tameable/CatEntity.java | 4 +- .../living/animal/tameable/ParrotEntity.java | 4 +- .../animal/tameable/TameableEntity.java | 8 +- .../living/animal/tameable/WolfEntity.java | 4 +- .../merchant/AbstractMerchantEntity.java | 6 +- .../living/merchant/VillagerEntity.java | 4 +- .../monster/AbstractSkeletonEntity.java | 4 +- .../living/monster/BasePiglinEntity.java | 6 +- .../living/monster/BlazeEntity.java | 4 +- .../living/monster/CreeperEntity.java | 4 +- .../living/monster/ElderGuardianEntity.java | 4 +- .../living/monster/EnderDragonEntity.java | 10 +- .../living/monster/EnderDragonPartEntity.java | 6 +- .../living/monster/EndermanEntity.java | 4 +- .../living/monster/GhastEntity.java | 6 +- .../living/monster/GiantEntity.java | 4 +- .../living/monster/GuardianEntity.java | 6 +- .../living/monster/MonsterEntity.java | 6 +- .../living/monster/PhantomEntity.java | 6 +- .../living/monster/PiglinEntity.java | 4 +- .../living/monster/ShulkerEntity.java | 6 +- .../living/monster/SkeletonEntity.java | 4 +- .../living/monster/SpiderEntity.java | 4 +- .../{ => type}/living/monster/VexEntity.java | 4 +- .../living/monster/WitherEntity.java | 6 +- .../living/monster/ZoglinEntity.java | 4 +- .../living/monster/ZombieEntity.java | 4 +- .../living/monster/ZombieVillagerEntity.java | 6 +- .../living/monster/ZombifiedPiglinEntity.java | 4 +- .../monster/raid/AbstractIllagerEntity.java | 4 +- .../living/monster/raid/PillagerEntity.java | 4 +- .../monster/raid/RaidParticipantEntity.java | 6 +- .../raid/SpellcasterIllagerEntity.java | 4 +- .../living/monster/raid/VindicatorEntity.java | 4 +- .../{ => type}/player/PlayerEntity.java | 14 +- .../player/SessionPlayerEntity.java | 6 +- .../{ => type}/player/SkullPlayerEntity.java | 4 +- .../inventory/BedrockContainerSlot.java | 2 +- .../geysermc/geyser/inventory/Container.java | 4 +- .../geyser/inventory/Generic3X3Container.java | 5 +- .../geyser/inventory/GeyserEnchantOption.java | 2 +- .../geyser/inventory/GeyserItemStack.java | 4 +- .../geysermc/geyser/inventory/Inventory.java | 2 +- .../geyser/inventory/MerchantContainer.java | 2 +- .../geyser/inventory/PlayerInventory.java | 2 +- .../translators => }/inventory/SlotType.java | 2 +- .../inventory/StonecutterContainer.java | 2 +- .../inventory/click/Click.java | 2 +- .../inventory/click/ClickPlan.java | 14 +- .../holder/BlockInventoryHolder.java | 8 +- .../inventory/holder/InventoryHolder.java | 6 +- .../item/Enchantment.java | 2 +- .../item/Potion.java | 2 +- .../item/StoredItemMappings.java | 2 +- .../item/TippedArrowPotion.java | 2 +- .../updater/AnvilInventoryUpdater.java | 12 +- .../updater/ChestInventoryUpdater.java | 12 +- .../updater/ContainerInventoryUpdater.java | 6 +- .../updater/HorseInventoryUpdater.java | 6 +- .../inventory/updater/InventoryUpdater.java | 6 +- .../inventory/updater/UIInventoryUpdater.java | 6 +- .../{utils => level}/BedrockMapIcon.java | 2 +- .../{utils => level}/FireworkColor.java | 2 +- .../geyser/{utils => level}/GameRule.java | 2 +- .../{utils => level}/GeyserAdvancement.java | 4 +- .../world => level}/GeyserWorldManager.java | 11 +- .../geyser/{utils => level}/MapColor.java | 2 +- .../geyser/{utils => level}/PaintingType.java | 2 +- .../world => level}/WorldManager.java | 5 +- .../block}/BlockPositionIterator.java | 2 +- .../block/BlockStateValues.java | 14 +- .../block/DoubleChestValue.java | 2 +- .../world => level}/chunk/BlockStorage.java | 6 +- .../world => level}/chunk/GeyserChunk.java | 2 +- .../chunk/GeyserChunkSection.java | 2 +- .../world => level}/chunk/NibbleArray.java | 2 +- .../chunk/bitarray/BitArray.java | 2 +- .../chunk/bitarray/BitArrayVersion.java | 4 +- .../chunk/bitarray/PaddedBitArray.java | 4 +- .../chunk/bitarray/Pow2BitArray.java | 4 +- .../chunk/bitarray/SingletonBitArray.java | 2 +- .../geyser/{utils => level/physics}/Axis.java | 2 +- .../physics}/BoundingBox.java | 4 +- .../physics}/CollisionManager.java | 21 ++- .../{utils => level/physics}/Direction.java | 2 +- .../physics}/PistonBehavior.java | 2 +- .../network/ConnectorServerEventHandler.java | 12 +- .../geyser/network/LoggingPacketHandler.java | 2 +- .../geyser/network/QueryPacketHandler.java | 4 +- .../geyser/network/UpstreamPacketHandler.java | 30 +++-- .../netty}/ChannelWrapper.java | 2 +- .../netty}/DefaultChannelPipelinePublic.java | 2 +- .../netty}/GeyserInjector.java | 4 +- .../netty}/LocalChannelWithRemoteAddress.java | 2 +- .../netty}/LocalChannelWrapper.java | 2 +- .../netty}/LocalServerChannelWrapper.java | 2 +- .../netty}/LocalSession.java | 2 +- .../translators/PacketTranslatorRegistry.java | 121 ------------------ .../geyser/{utils => pack}/ResourcePack.java | 6 +- .../{utils => pack}/ResourcePackManifest.java | 2 +- .../ping/GeyserLegacyPingPassthrough.java | 1 - .../{common => }/ping/GeyserPingInfo.java | 2 +- .../geyser/ping/IGeyserPingPassthrough.java | 2 - .../registry/AbstractMappedRegistry.java | 19 +++ .../geyser/registry/BlockRegistries.java | 2 +- .../registry/PacketTranslatorRegistry.java | 96 ++++++++++++++ .../geysermc/geyser/registry/Registries.java | 38 ++++-- .../loader/AnnotatedRegistryLoader.java | 4 +- .../loader/BiomeIdentifierRegistryLoader.java | 2 +- .../loader/BlockEntityRegistryLoader.java | 8 +- .../loader/CollisionRegistryLoader.java | 12 +- .../registry/loader/EffectRegistryLoader.java | 2 +- .../loader/EnchantmentRegistryLoader.java | 4 +- .../registry/loader/NbtRegistryLoader.java | 2 +- .../loader/PotionMixRegistryLoader.java | 2 +- .../loader/SoundEventsRegistryLoader.java | 22 ++-- .../registry/loader/SoundRegistryLoader.java | 2 +- ...ava => SoundTranslatorRegistryLoader.java} | 10 +- .../populator/BlockRegistryPopulator.java | 8 +- .../populator/ItemRegistryPopulator.java | 4 +- .../populator/PacketRegistryPopulator.java | 63 +++++++++ .../populator/RecipeRegistryPopulator.java | 10 +- .../geyser/registry/type/BlockMapping.java | 4 +- .../geyser/registry/type/EnchantmentData.java | 2 +- .../geyser/registry/type/ItemMappings.java | 2 +- .../geyser/registry/type/ParticleMapping.java | 9 ++ .../geyser/scoreboard/Scoreboard.java | 10 +- .../geyser/scoreboard/ScoreboardUpdater.java | 10 +- .../{network => }/session/GeyserSession.java | 88 +++++++------ .../geyser/{ => session}/SessionManager.java | 8 +- .../session/UpstreamSession.java | 2 +- .../{network => }/session/auth/AuthData.java | 2 +- .../{common => session/auth}/AuthType.java | 2 +- .../session/auth/BedrockClientData.java | 2 +- .../session/cache/AdvancementsCache.java | 22 ++-- .../session/cache/BookEditCache.java | 4 +- .../{network => }/session/cache/BossBar.java | 6 +- .../session/cache/ChunkCache.java | 10 +- .../session/cache/EntityCache.java | 10 +- .../session/cache/EntityEffectCache.java | 2 +- .../session/cache/FormCache.java | 4 +- .../session/cache/LodestoneCache.java | 2 +- .../session/cache/PistonCache.java | 12 +- .../session/cache/PreferencesCache.java | 6 +- .../{network => }/session/cache/TagCache.java | 2 +- .../session/cache/TeleportCache.java | 2 +- .../session/cache/WorldBorder.java | 6 +- .../session/cache/WorldCache.java | 4 +- .../geyser/skin/FloodgateSkinUploader.java | 8 +- .../org/geysermc/geyser/skin/SkinManager.java | 16 +-- .../geysermc/geyser/skin/SkinProvider.java | 6 +- .../geyser/skin/SkullSkinManager.java | 8 +- .../AsteriskSerializer.java | 2 +- .../geyser/{common => text}/ChatColor.java | 2 +- .../GeyserLocale.java} | 5 +- .../GsonComponentSerializerWrapper.java | 9 +- .../MinecraftLocale.java} | 34 ++--- .../MinecraftTranslationRegistry.java | 5 +- .../collision}/BlockCollision.java | 10 +- .../collision/CollisionRemapper.java | 2 +- .../collision}/DirtPathCollision.java | 7 +- .../collision}/DoorCollision.java | 8 +- .../collision}/OtherCollision.java | 4 +- .../collision}/ScaffoldingCollision.java | 7 +- .../collision}/SnowCollision.java | 7 +- .../collision}/SolidCollision.java | 5 +- .../collision}/SpawnerCollision.java | 3 +- .../collision}/TrapdoorCollision.java | 9 +- .../entity/EntityMetadataTranslator.java | 7 +- .../AbstractBlockInventoryTranslator.java | 10 +- .../inventory}/AnvilInventoryTranslator.java | 8 +- .../inventory}/BaseInventoryTranslator.java | 9 +- .../inventory}/BeaconInventoryTranslator.java | 13 +- .../BrewingInventoryTranslator.java | 8 +- .../CartographyInventoryTranslator.java | 8 +- .../CraftingInventoryTranslator.java | 8 +- .../EnchantingInventoryTranslator.java | 10 +- .../Generic3X3InventoryTranslator.java | 8 +- .../GrindstoneInventoryTranslator.java | 6 +- .../inventory}/HopperInventoryTranslator.java | 6 +- .../inventory/InventoryTranslator.java | 25 ++-- .../LecternInventoryTranslator.java | 10 +- .../inventory}/LoomInventoryTranslator.java | 12 +- .../MerchantInventoryTranslator.java | 14 +- .../inventory}/PlayerInventoryTranslator.java | 17 ++- .../ShulkerInventoryTranslator.java | 12 +- .../SmithingInventoryTranslator.java | 6 +- .../StonecutterInventoryTranslator.java | 12 +- .../chest/ChestInventoryTranslator.java | 12 +- .../chest/DoubleChestInventoryTranslator.java | 10 +- .../chest/SingleChestInventoryTranslator.java | 8 +- .../AbstractFurnaceInventoryTranslator.java | 12 +- .../BlastFurnaceInventoryTranslator.java | 4 +- .../furnace/FurnaceInventoryTranslator.java | 4 +- .../furnace/SmokerInventoryTranslator.java | 4 +- .../AbstractHorseInventoryTranslator.java | 10 +- .../ChestedHorseInventoryTranslator.java | 6 +- .../horse/DonkeyInventoryTranslator.java | 2 +- .../horse/HorseInventoryTranslator.java | 4 +- .../horse/LlamaInventoryTranslator.java | 2 +- .../inventory/item}/BannerTranslator.java | 4 +- .../inventory/item}/CompassTranslator.java | 4 +- .../inventory/item}/ItemRemapper.java | 2 +- .../inventory}/item/ItemTranslator.java | 13 +- .../item/NbtItemStackTranslator.java | 4 +- .../inventory/item}/PotionTranslator.java | 6 +- .../item}/TippedArrowTranslator.java | 6 +- .../item}/nbt/AxolotlBucketTranslator.java | 12 +- .../item}/nbt/BasicItemTranslator.java | 12 +- .../item}/nbt/BookPagesTranslator.java | 10 +- .../item}/nbt/CrossbowTranslator.java | 10 +- .../item}/nbt/EnchantedBookTranslator.java | 8 +- .../item}/nbt/EnchantmentTranslator.java | 10 +- .../item}/nbt/FireworkBaseTranslator.java | 8 +- .../item}/nbt/FireworkRocketTranslator.java | 8 +- .../item}/nbt/FireworkStarTranslator.java | 6 +- .../item}/nbt/LeatherArmorTranslator.java | 8 +- .../item}/nbt/LodestoneCompassTranslator.java | 8 +- .../item}/nbt/MapItemTranslator.java | 8 +- .../item}/nbt/PlayerHeadTranslator.java | 12 +- .../item}/nbt/ShulkerBoxItemTranslator.java | 11 +- .../nbt/TropicalFishBucketTranslator.java | 16 +-- .../level}/BiomeTranslator.java | 16 +-- .../entity/BannerBlockEntityTranslator.java | 6 +- .../entity/BeaconBlockEntityTranslator.java | 2 +- .../entity/BedBlockEntityTranslator.java | 4 +- .../block/entity/BedrockOnlyBlockEntity.java | 4 +- .../level}/block/entity/BlockEntity.java | 2 +- .../block/entity/BlockEntityTranslator.java | 4 +- .../entity/CampfireBlockEntityTranslator.java | 2 +- .../CommandBlockBlockEntityTranslator.java | 6 +- .../DoubleChestBlockEntityTranslator.java | 10 +- .../entity/EmptyBlockEntityTranslator.java | 2 +- .../EndGatewayBlockEntityTranslator.java | 2 +- .../FlowerPotBlockEntityTranslator.java | 8 +- .../JigsawBlockBlockEntityTranslator.java | 2 +- .../NoteblockBlockEntityTranslator.java | 6 +- .../block/entity/PistonBlockEntity.java | 18 +-- .../entity/PistonBlockEntityTranslator.java | 4 +- .../block/entity/RequiresBlockState.java | 2 +- .../ShulkerBoxBlockEntityTranslator.java | 7 +- .../entity/SignBlockEntityTranslator.java | 6 +- .../entity/SkullBlockEntityTranslator.java | 8 +- .../entity/SpawnerBlockEntityTranslator.java | 2 +- .../level/event/LevelEventTranslator.java} | 8 +- .../event/PlaySoundEventTranslator.java} | 10 +- .../event/SoundEventEventTranslator.java} | 10 +- .../event/SoundLevelEventTranslator.java} | 10 +- .../protocol}/PacketTranslator.java | 4 +- .../protocol}/Translator.java | 3 +- .../BedrockAdventureSettingsTranslator.java | 8 +- .../bedrock/BedrockAnimateTranslator.java | 8 +- .../BedrockBlockEntityDataTranslator.java | 10 +- .../BedrockBlockPickRequestTranslator.java | 14 +- .../bedrock/BedrockBookEditTranslator.java | 8 +- .../BedrockCommandBlockUpdateTranslator.java | 8 +- .../BedrockCommandRequestTranslator.java | 10 +- .../BedrockContainerCloseTranslator.java | 10 +- .../bedrock/BedrockEmoteListTranslator.java | 8 +- .../BedrockEntityPickRequestTranslator.java | 14 +- .../bedrock/BedrockFilterTextTranslator.java | 12 +- ...BedrockInventoryTransactionTranslator.java | 22 ++-- .../BedrockItemFrameDropItemTranslator.java | 12 +- .../BedrockItemStackRequestTranslator.java | 10 +- .../BedrockLecternUpdateTranslator.java | 10 +- .../BedrockMapInfoRequestTranslator.java | 8 +- .../BedrockMobEquipmentTranslator.java | 12 +- .../BedrockMoveEntityAbsoluteTranslator.java | 12 +- .../BedrockNetworkStackLatencyTranslator.java | 8 +- ...drockPacketViolationWarningTranslator.java | 8 +- .../bedrock/BedrockPlayerInputTranslator.java | 16 +-- ...tionTrackingDBClientRequestTranslator.java | 12 +- .../bedrock/BedrockRespawnTranslator.java | 10 +- ...edrockServerSettingsRequestTranslator.java | 10 +- ...SetLocalPlayerAsInitializedTranslator.java | 12 +- .../bedrock/BedrockShowCreditsTranslator.java | 8 +- .../bedrock/BedrockTextTranslator.java | 10 +- .../entity/BedrockEntityEventTranslator.java | 10 +- .../player/BedrockActionTranslator.java | 18 +-- .../entity/player/BedrockEmoteTranslator.java | 12 +- .../player/BedrockInteractTranslator.java | 14 +- .../player/BedrockMovePlayerTranslator.java | 12 +- .../player/BedrockRiderJumpTranslator.java | 12 +- .../BedrockSetPlayerGameTypeTranslator.java | 8 +- .../BedrockLevelSoundEventTranslator.java | 10 +- .../java/JavaAwardStatsTranslator.java | 10 +- .../java/JavaBossEventTranslator.java | 10 +- .../java/JavaChangeDifficultyTranslator.java | 8 +- .../protocol}/java/JavaChatTranslator.java | 10 +- .../java/JavaCommandsTranslator.java | 12 +- .../java/JavaCustomPayloadTranslator.java | 10 +- .../java/JavaCustomQueryTranslator.java | 8 +- .../java/JavaDisconnectTranslator.java | 10 +- .../java/JavaGameProfileTranslator.java | 12 +- .../java/JavaKeepAliveTranslator.java | 8 +- .../java/JavaLoginDisconnectTranslator.java | 10 +- .../protocol}/java/JavaLoginTranslator.java | 20 +-- .../protocol}/java/JavaPingTranslator.java | 8 +- .../protocol}/java/JavaRecipeTranslator.java | 8 +- .../protocol}/java/JavaRespawnTranslator.java | 16 +-- .../JavaSelectAdvancementsTabTranslator.java | 10 +- .../JavaUpdateAdvancementsTranslator.java | 18 +-- .../java/JavaUpdateRecipesTranslator.java | 14 +- .../java/JavaUpdateTagsTranslator.java | 8 +- .../java/entity/JavaAnimateTranslator.java | 12 +- .../entity/JavaEntityEventTranslator.java | 14 +- .../JavaMoveEntityPosRotTranslator.java | 10 +- .../entity/JavaMoveEntityPosTranslator.java | 10 +- .../entity/JavaMoveEntityRotTranslator.java | 10 +- .../entity/JavaMoveVehicleTranslator.java | 10 +- .../entity/JavaRemoveEntitiesTranslator.java | 10 +- .../entity/JavaRemoveMobEffectTranslator.java | 12 +- .../java/entity/JavaRotateHeadTranslator.java | 10 +- .../entity/JavaSetEntityDataTranslator.java | 16 +-- .../entity/JavaSetEntityLinkTranslator.java | 12 +- .../entity/JavaSetEntityMotionTranslator.java | 14 +- .../entity/JavaSetEquipmentTranslator.java | 14 +- .../entity/JavaSetPassengersTranslator.java | 12 +- .../entity/JavaTakeItemEntityTranslator.java | 12 +- .../entity/JavaTeleportEntityTranslator.java | 10 +- .../JavaUpdateAttributesTranslator.java | 12 +- .../entity/JavaUpdateMobEffectTranslator.java | 12 +- .../player/JavaBlockBreakAckTranslator.java | 12 +- .../player/JavaPlayerAbilitiesTranslator.java | 8 +- .../player/JavaPlayerInfoTranslator.java | 10 +- .../player/JavaPlayerPositionTranslator.java | 22 ++-- .../player/JavaSetCarriedItemTranslator.java | 8 +- .../player/JavaSetExperienceTranslator.java | 10 +- .../player/JavaSetHealthTranslator.java | 10 +- .../entity/spawn/JavaAddEntityTranslator.java | 18 ++- .../spawn/JavaAddExperienceOrbTranslator.java | 12 +- .../entity/spawn/JavaAddMobTranslator.java | 14 +- .../spawn/JavaAddPaintingTranslator.java | 12 +- .../entity/spawn/JavaAddPlayerTranslator.java | 14 +- .../JavaContainerCloseTranslator.java | 10 +- .../JavaContainerSetContentTranslator.java | 12 +- .../JavaContainerSetDataTranslator.java | 12 +- .../JavaContainerSetSlotTranslator.java | 18 +-- .../JavaHorseScreenOpenTranslator.java | 24 ++-- .../JavaMerchantOffersTranslator.java | 12 +- .../inventory/JavaOpenScreenTranslator.java | 18 +-- .../level/JavaBlockDestructionTranslator.java | 10 +- .../level/JavaBlockEntityDataTranslator.java | 18 +-- .../java/level/JavaBlockEventTranslator.java | 18 +-- .../java/level/JavaBlockUpdateTranslator.java | 14 +- .../java/level/JavaCustomSoundTranslator.java | 8 +- .../java/level/JavaExplodeTranslator.java | 12 +- .../level/JavaForgetLevelChunkTranslator.java | 8 +- .../java/level/JavaGameEventTranslator.java | 16 +-- .../JavaLevelChunkWithLightTranslator.java | 36 +++--- .../java/level/JavaLevelEventTranslator.java | 18 +-- .../level/JavaLevelParticlesTranslator.java | 12 +- .../java/level/JavaMapItemDataTranslator.java | 14 +- .../JavaSectionBlocksUpdateTranslator.java | 10 +- .../JavaSetChunkCacheCenterTranslator.java | 10 +- .../JavaSetChunkCacheRadiusTranslator.java | 8 +- ...JavaSetDefaultSpawnPositionTranslator.java | 10 +- .../java/level/JavaSetTimeTranslator.java | 8 +- .../java/level/JavaSoundTranslator.java | 12 +- .../java/level/JavaStopSoundTranslator.java | 8 +- .../JavaInitializeBorderTranslator.java | 10 +- .../border/JavaSetBorderCenterTranslator.java | 10 +- .../JavaSetBorderLerpSizeTranslator.java | 10 +- .../border/JavaSetBorderSizeTranslator.java | 10 +- .../JavaSetBorderWarningDelayTranslator.java | 10 +- ...avaSetBorderWarningDistanceTranslator.java | 10 +- .../JavaSetDisplayObjectiveTranslator.java | 10 +- .../JavaSetObjectiveTranslator.java | 14 +- .../JavaSetPlayerTeamTranslator.java | 10 +- .../scoreboard/JavaSetScoreTranslator.java | 16 +-- .../java/title/JavaClearTitlesTranslator.java | 8 +- .../title/JavaSetActionBarTextTranslator.java | 10 +- .../title/JavaSetSubtitleTextTranslator.java | 10 +- .../title/JavaSetTitleTextTranslator.java | 10 +- .../JavaSetTitlesAnimationTranslator.java | 8 +- .../BlockSoundInteractionTranslator.java} | 14 +- .../EntitySoundInteractionTranslator.java} | 14 +- .../sound/SoundInteractionTranslator.java} | 8 +- .../sound/SoundTranslator.java} | 10 +- .../BucketSoundInteractionTranslator.java} | 16 +-- ...ComparatorSoundInteractionTranslator.java} | 14 +- .../DoorSoundInteractionTranslator.java} | 14 +- .../FlintAndSteelInteractionTranslator.java} | 14 +- .../GrassPathInteractionTranslator.java} | 14 +- .../block/HoeInteractionTranslator.java} | 14 +- .../LeverSoundInteractionTranslator.java} | 14 +- .../FeedBabySoundInteractionTranslator.java} | 22 ++-- ...MilkEntitySoundInteractionTranslator.java} | 18 +-- .../text}/MessageTranslator.java | 16 ++- .../{utils => util}/AttributeUtils.java | 2 +- .../{utils => util}/BlockEntityUtils.java | 10 +- .../geyser/{utils => util}/BlockUtils.java | 8 +- .../geyser/{utils => util}/ChunkUtils.java | 23 ++-- .../geyser/{utils => util}/CooldownUtils.java | 6 +- .../{utils => util}/DimensionUtils.java | 6 +- .../geyser/{utils => util}/EntityUtils.java | 8 +- .../geyser/{utils => util}/FileUtils.java | 2 +- .../{utils => util}/InventoryUtils.java | 15 ++- .../geyser/{utils => util}/ItemUtils.java | 4 +- .../{utils => util}/LoginEncryptionUtils.java | 27 ++-- .../geyser/{utils => util}/MathUtils.java | 2 +- .../geyser/{metrics => util}/Metrics.java | 2 +- .../geyser/{utils => util}/NewsHandler.java | 7 +- .../{utils => util}/PluginMessageUtils.java | 4 +- .../geyser/{utils => util}/SettingsUtils.java | 15 ++- .../geyser/{utils => util}/SignUtils.java | 2 +- .../geyser/{utils => util}/SoundUtils.java | 2 +- .../{utils => util}/StatisticsUtils.java | 14 +- .../geyser/{utils => util}/WebUtils.java | 2 +- .../collection}/FixedInt2BooleanMap.java | 2 +- .../collection}/FixedInt2ByteMap.java | 2 +- .../collection}/FixedInt2IntMap.java | 2 +- .../collection}/LecternHasBookMap.java | 10 +- .../collection}/Object2IntBiMap.java | 2 +- .../collection}/package-info.java | 2 +- .../geysermc/geyser/utils/DockerCheck.java | 49 ------- .../geysermc/geyser/utils/EffectUtils.java | 61 --------- .../chat/MessageTranslatorTest.java | 1 + .../collection}/GeyserCollectionsTest.java | 2 +- 561 files changed, 2468 insertions(+), 2457 deletions(-) rename core/src/main/java/org/geysermc/geyser/{utils => }/Constants.java (98%) rename core/src/main/java/org/geysermc/geyser/{bootstrap => }/GeyserBootstrap.java (94%) rename core/src/main/java/org/geysermc/geyser/{common/main/IGeyserMain.java => GeyserMain.java} (91%) rename core/src/main/java/org/geysermc/geyser/{utils => entity}/InteractiveTagManager.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/AbstractArrowEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/AreaEffectCloudEntity.java (90%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/BoatEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/CommandBlockMinecartEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/DefaultBlockMinecartEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/EnderCrystalEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/Entity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ExpOrbEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/FallingBlockEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/FireworkEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/FishingHookEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/FurnaceMinecartEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ItemEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ItemFrameEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ItemedFireballEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/LeashKnotEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/LightningEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/LivingEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/MinecartEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/PaintingEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/SpawnerMinecartEntity.java (90%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/TNTEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ThrowableEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ThrowableItemEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/ThrownPotionEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/Tickable.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/TippedArrowEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/TridentEntity.java (91%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/WitherSkullEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/AbstractFishEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/AgeableEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/AmbientEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/ArmorStandEntity.java (99%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/BatEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/CreatureEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/FlyingEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/GlowSquidEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/GolemEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/IronGolemEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/MagmaCubeEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/MobEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/SlimeEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/SnowGolemEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/SquidEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/WaterEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/AnimalEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/AxolotlEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/BeeEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/ChickenEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/FoxEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/GoatEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/HoglinEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/MooshroomEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/OcelotEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/PandaEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/PigEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/PolarBearEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/PufferFishEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/RabbitEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/SheepEntity.java (91%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/StriderEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/TropicalFishEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/TurtleEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/horse/AbstractHorseEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/horse/ChestedHorseEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/horse/HorseEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/horse/LlamaEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/horse/TraderLlamaEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/tameable/CatEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/tameable/ParrotEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/tameable/TameableEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/animal/tameable/WolfEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/merchant/AbstractMerchantEntity.java (91%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/merchant/VillagerEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/AbstractSkeletonEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/BasePiglinEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/BlazeEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/CreeperEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ElderGuardianEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/EnderDragonEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/EnderDragonPartEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/EndermanEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/GhastEntity.java (92%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/GiantEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/GuardianEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/MonsterEntity.java (90%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/PhantomEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/PiglinEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ShulkerEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/SkeletonEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/SpiderEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/VexEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/WitherEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ZoglinEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ZombieEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ZombieVillagerEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/ZombifiedPiglinEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/raid/AbstractIllagerEntity.java (93%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/raid/PillagerEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/raid/RaidParticipantEntity.java (90%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/raid/SpellcasterIllagerEntity.java (96%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/living/monster/raid/VindicatorEntity.java (94%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/player/PlayerEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/player/SessionPlayerEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/entity/{ => type}/player/SkullPlayerEntity.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/BedrockContainerSlot.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/SlotType.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/click/Click.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/click/ClickPlan.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/holder/BlockInventoryHolder.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/holder/InventoryHolder.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => inventory}/item/Enchantment.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators => inventory}/item/Potion.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators => inventory}/item/StoredItemMappings.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators => inventory}/item/TippedArrowPotion.java (99%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/AnvilInventoryUpdater.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/ChestInventoryUpdater.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/ContainerInventoryUpdater.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/HorseInventoryUpdater.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/InventoryUpdater.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => }/inventory/updater/UIInventoryUpdater.java (93%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/BedrockMapIcon.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/FireworkColor.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/GameRule.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/GeyserAdvancement.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/GeyserWorldManager.java (92%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/MapColor.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => level}/PaintingType.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/WorldManager.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => level/block}/BlockPositionIterator.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/block/BlockStateValues.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/block/DoubleChestValue.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/BlockStorage.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/GeyserChunk.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/GeyserChunkSection.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/NibbleArray.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/bitarray/BitArray.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/bitarray/BitArrayVersion.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/bitarray/PaddedBitArray.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/bitarray/Pow2BitArray.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => level}/chunk/bitarray/SingletonBitArray.java (96%) rename core/src/main/java/org/geysermc/geyser/{utils => level/physics}/Axis.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision => level/physics}/BoundingBox.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision => level/physics}/CollisionManager.java (96%) rename core/src/main/java/org/geysermc/geyser/{utils => level/physics}/Direction.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils => level/physics}/PistonBehavior.java (97%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/ChannelWrapper.java (99%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/DefaultChannelPipelinePublic.java (97%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/GeyserInjector.java (97%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/LocalChannelWithRemoteAddress.java (97%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/LocalChannelWrapper.java (98%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/LocalServerChannelWrapper.java (97%) rename core/src/main/java/org/geysermc/geyser/{common/connection => network/netty}/LocalSession.java (99%) delete mode 100644 core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java rename core/src/main/java/org/geysermc/geyser/{utils => pack}/ResourcePack.java (94%) rename core/src/main/java/org/geysermc/geyser/{utils => pack}/ResourcePackManifest.java (99%) rename core/src/main/java/org/geysermc/geyser/{common => }/ping/GeyserPingInfo.java (98%) create mode 100644 core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java rename core/src/main/java/org/geysermc/geyser/registry/loader/{SoundHandlerRegistryLoader.java => SoundTranslatorRegistryLoader.java} (78%) create mode 100644 core/src/main/java/org/geysermc/geyser/registry/populator/PacketRegistryPopulator.java rename core/src/main/java/org/geysermc/geyser/{network => }/session/GeyserSession.java (92%) rename core/src/main/java/org/geysermc/geyser/{ => session}/SessionManager.java (93%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/UpstreamSession.java (98%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/auth/AuthData.java (97%) rename core/src/main/java/org/geysermc/geyser/{common => session/auth}/AuthType.java (98%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/auth/BedrockClientData.java (98%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/AdvancementsCache.java (91%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/BookEditCache.java (96%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/BossBar.java (96%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/ChunkCache.java (94%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/EntityCache.java (95%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/EntityEffectCache.java (97%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/FormCache.java (97%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/LodestoneCache.java (99%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/PistonCache.java (95%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/PreferencesCache.java (95%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/TagCache.java (99%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/TeleportCache.java (98%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/WorldBorder.java (98%) rename core/src/main/java/org/geysermc/geyser/{network => }/session/cache/WorldCache.java (95%) rename core/src/main/java/org/geysermc/geyser/{common/serializer => text}/AsteriskSerializer.java (98%) rename core/src/main/java/org/geysermc/geyser/{common => text}/ChatColor.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils/LanguageUtils.java => text/GeyserLocale.java} (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/chat => text}/GsonComponentSerializerWrapper.java (89%) rename core/src/main/java/org/geysermc/geyser/{utils/LocaleUtils.java => text/MinecraftLocale.java} (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/chat => text}/MinecraftTranslationRegistry.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/BlockCollision.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator}/collision/CollisionRemapper.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/DirtPathCollision.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/DoorCollision.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/OtherCollision.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/ScaffoldingCollision.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/SnowCollision.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/SolidCollision.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/SpawnerCollision.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/collision/translators => translator/collision}/TrapdoorCollision.java (91%) rename core/src/main/java/org/geysermc/geyser/{ => translator}/entity/EntityMetadataTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/AbstractBlockInventoryTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/AnvilInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/BaseInventoryTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/BeaconInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/BrewingInventoryTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/CartographyInventoryTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/CraftingInventoryTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/EnchantingInventoryTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/Generic3X3InventoryTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/GrindstoneInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/HopperInventoryTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator}/inventory/InventoryTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/LecternInventoryTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/LoomInventoryTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/MerchantInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/PlayerInventoryTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/ShulkerInventoryTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/SmithingInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/StonecutterInventoryTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/chest/ChestInventoryTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/chest/DoubleChestInventoryTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/chest/SingleChestInventoryTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/furnace/AbstractFurnaceInventoryTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/furnace/BlastFurnaceInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/furnace/FurnaceInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/furnace/SmokerInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/horse/AbstractHorseInventoryTranslator.java (84%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/horse/ChestedHorseInventoryTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/horse/DonkeyInventoryTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/horse/HorseInventoryTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/inventory/translators => translator/inventory}/horse/LlamaInventoryTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/BannerTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/CompassTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/inventory/item}/ItemRemapper.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/inventory}/item/ItemTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/inventory}/item/NbtItemStackTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/PotionTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/TippedArrowTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/AxolotlBucketTranslator.java (83%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/BasicItemTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/BookPagesTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/CrossbowTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/EnchantedBookTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/EnchantmentTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/FireworkBaseTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/FireworkRocketTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/FireworkStarTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/LeatherArmorTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/LodestoneCompassTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/MapItemTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/PlayerHeadTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/ShulkerBoxItemTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/item/translators => translator/inventory/item}/nbt/TropicalFishBucketTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/BiomeTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BannerBlockEntityTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BeaconBlockEntityTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BedBlockEntityTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BedrockOnlyBlockEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BlockEntity.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/BlockEntityTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/CampfireBlockEntityTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/CommandBlockBlockEntityTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/DoubleChestBlockEntityTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/EmptyBlockEntityTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/EndGatewayBlockEntityTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/FlowerPotBlockEntityTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/JigsawBlockBlockEntityTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/NoteblockBlockEntityTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/PistonBlockEntity.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/PistonBlockEntityTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/RequiresBlockState.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/ShulkerBoxBlockEntityTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/SignBlockEntityTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/SkullBlockEntityTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world => translator/level}/block/entity/SpawnerBlockEntityTranslator.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world/event/LevelEventTransformer.java => translator/level/event/LevelEventTranslator.java} (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world/event/PlaySoundEventTransformer.java => translator/level/event/PlaySoundEventTranslator.java} (83%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world/event/SoundEventEventTransformer.java => translator/level/event/SoundEventEventTranslator.java} (84%) rename core/src/main/java/org/geysermc/geyser/{network/translators/world/event/SoundLevelEventTransformer.java => translator/level/event/SoundLevelEventTranslator.java} (83%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/PacketTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/Translator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockAdventureSettingsTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockAnimateTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockBlockEntityDataTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockBlockPickRequestTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockBookEditTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockCommandBlockUpdateTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockCommandRequestTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockContainerCloseTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockEmoteListTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockEntityPickRequestTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockFilterTextTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockInventoryTransactionTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockItemFrameDropItemTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockItemStackRequestTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockLecternUpdateTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockMapInfoRequestTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockMobEquipmentTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockMoveEntityAbsoluteTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockNetworkStackLatencyTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockPacketViolationWarningTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockPlayerInputTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockRespawnTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockServerSettingsRequestTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockShowCreditsTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/BedrockTextTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/BedrockEntityEventTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockActionTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockEmoteTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockInteractTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockMovePlayerTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockRiderJumpTranslator.java (84%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/bedrock/world/BedrockLevelSoundEventTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaAwardStatsTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaBossEventTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaChangeDifficultyTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaChatTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaCommandsTranslator.java (98%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaCustomPayloadTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaCustomQueryTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaDisconnectTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaGameProfileTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaKeepAliveTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaLoginDisconnectTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaLoginTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaPingTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaRecipeTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaRespawnTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaSelectAdvancementsTabTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaUpdateAdvancementsTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaUpdateRecipesTranslator.java (97%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/JavaUpdateTagsTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaAnimateTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaEntityEventTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaMoveEntityPosRotTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaMoveEntityPosTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaMoveEntityRotTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaMoveVehicleTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaRemoveEntitiesTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaRemoveMobEffectTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaRotateHeadTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaSetEntityDataTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaSetEntityLinkTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaSetEntityMotionTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaSetEquipmentTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaSetPassengersTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaTakeItemEntityTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaTeleportEntityTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaUpdateAttributesTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/JavaUpdateMobEffectTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaBlockBreakAckTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaPlayerAbilitiesTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaPlayerInfoTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaPlayerPositionTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaSetCarriedItemTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaSetExperienceTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/player/JavaSetHealthTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/spawn/JavaAddEntityTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/spawn/JavaAddExperienceOrbTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/spawn/JavaAddMobTranslator.java (84%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/spawn/JavaAddPaintingTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/entity/spawn/JavaAddPlayerTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaContainerCloseTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaContainerSetContentTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaContainerSetDataTranslator.java (84%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaContainerSetSlotTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaHorseScreenOpenTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaMerchantOffersTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/inventory/JavaOpenScreenTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaBlockDestructionTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaBlockEntityDataTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaBlockEventTranslator.java (92%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaBlockUpdateTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaCustomSoundTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaExplodeTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaForgetLevelChunkTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaGameEventTranslator.java (94%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaLevelChunkWithLightTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaLevelEventTranslator.java (96%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaLevelParticlesTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaMapItemDataTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSectionBlocksUpdateTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSetChunkCacheCenterTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSetChunkCacheRadiusTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSetDefaultSpawnPositionTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSetTimeTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaSoundTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/JavaStopSoundTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaInitializeBorderTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaSetBorderCenterTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaSetBorderLerpSizeTranslator.java (86%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaSetBorderSizeTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaSetBorderWarningDelayTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/level/border/JavaSetBorderWarningDistanceTranslator.java (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/scoreboard/JavaSetDisplayObjectiveTranslator.java (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/scoreboard/JavaSetObjectiveTranslator.java (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/scoreboard/JavaSetPlayerTeamTranslator.java (95%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/scoreboard/JavaSetScoreTranslator.java (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/title/JavaClearTitlesTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/title/JavaSetActionBarTextTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/title/JavaSetSubtitleTextTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/title/JavaSetTitleTextTranslator.java (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators => translator/protocol}/java/title/JavaSetTitlesAnimationTranslator.java (89%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/BlockSoundInteractionHandler.java => translator/sound/BlockSoundInteractionTranslator.java} (90%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/EntitySoundInteractionHandler.java => translator/sound/EntitySoundInteractionTranslator.java} (87%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/SoundInteractionHandler.java => translator/sound/SoundInteractionTranslator.java} (88%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/SoundHandler.java => translator/sound/SoundTranslator.java} (91%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/BucketSoundInteractionHandler.java => translator/sound/block/BucketSoundInteractionTranslator.java} (85%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/ComparatorSoundInteractionHandler.java => translator/sound/block/ComparatorSoundInteractionTranslator.java} (78%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/DoorSoundInteractionHandler.java => translator/sound/block/DoorSoundInteractionTranslator.java} (77%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/FlintAndSteelInteractionHandler.java => translator/sound/block/FlintAndSteelInteractionTranslator.java} (77%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/HoeInteractionHandler.java => translator/sound/block/GrassPathInteractionTranslator.java} (79%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/GrassPathInteractionHandler.java => translator/sound/block/HoeInteractionTranslator.java} (78%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/block/LeverSoundInteractionHandler.java => translator/sound/block/LeverSoundInteractionTranslator.java} (78%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/entity/FeedBabySoundInteractionHandler.java => translator/sound/entity/FeedBabySoundInteractionTranslator.java} (75%) rename core/src/main/java/org/geysermc/geyser/{network/translators/sound/entity/MilkEntitySoundInteractionHandler.java => translator/sound/entity/MilkEntitySoundInteractionTranslator.java} (79%) rename core/src/main/java/org/geysermc/geyser/{network/translators/chat => translator/text}/MessageTranslator.java (93%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/AttributeUtils.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/BlockEntityUtils.java (92%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/BlockUtils.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/ChunkUtils.java (93%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/CooldownUtils.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/DimensionUtils.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/EntityUtils.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/FileUtils.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/InventoryUtils.java (96%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/ItemUtils.java (96%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/LoginEncryptionUtils.java (91%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/MathUtils.java (99%) rename core/src/main/java/org/geysermc/geyser/{metrics => util}/Metrics.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/NewsHandler.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/PluginMessageUtils.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/SettingsUtils.java (94%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/SignUtils.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/SoundUtils.java (97%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/StatisticsUtils.java (96%) rename core/src/main/java/org/geysermc/geyser/{utils => util}/WebUtils.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/FixedInt2BooleanMap.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/FixedInt2ByteMap.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/FixedInt2IntMap.java (98%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/LecternHasBookMap.java (91%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/Object2IntBiMap.java (99%) rename core/src/main/java/org/geysermc/geyser/{utils/collections => util/collection}/package-info.java (97%) delete mode 100644 core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java delete mode 100644 core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java rename core/src/test/java/org/geysermc/geyser/{utils/collections => util/collection}/GeyserCollectionsTest.java (99%) diff --git a/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java b/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java index e1d7e91f1..5a0b2d2f9 100644 --- a/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java +++ b/ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java @@ -33,6 +33,6 @@ import javax.lang.model.SourceVersion; @SupportedSourceVersion(SourceVersion.RELEASE_16) public class BlockEntityProcessor extends ClassProcessor { public BlockEntityProcessor() { - super("org.geysermc.geyser.network.translators.world.block.entity.BlockEntity"); + super("org.geysermc.geyser.translator.level.block.entity.BlockEntity"); } } diff --git a/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java b/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java index 1fcebb01d..eae2e5d97 100644 --- a/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java +++ b/ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java @@ -33,6 +33,6 @@ import javax.lang.model.SourceVersion; @SupportedSourceVersion(SourceVersion.RELEASE_16) public class CollisionRemapperProcessor extends ClassProcessor { public CollisionRemapperProcessor() { - super("org.geysermc.geyser.network.translators.collision.CollisionRemapper"); + super("org.geysermc.geyser.translator.collision.CollisionRemapper"); } } diff --git a/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java b/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java index e7f764055..cb49e8749 100644 --- a/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java +++ b/ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java @@ -33,6 +33,6 @@ import javax.lang.model.SourceVersion; @SupportedSourceVersion(SourceVersion.RELEASE_16) public class ItemRemapperProcessor extends ClassProcessor { public ItemRemapperProcessor() { - super("org.geysermc.geyser.network.translators.ItemRemapper"); + super("org.geysermc.geyser.translator.inventory.item.ItemRemapper"); } } diff --git a/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java b/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java index 53307384a..5c46453e3 100644 --- a/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java +++ b/ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java @@ -33,6 +33,6 @@ import javax.lang.model.SourceVersion; @SupportedSourceVersion(SourceVersion.RELEASE_16) public class PacketTranslatorProcessor extends ClassProcessor { public PacketTranslatorProcessor() { - super("org.geysermc.geyser.network.translators.Translator"); + super("org.geysermc.geyser.translator.protocol.Translator"); } } diff --git a/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java b/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java index 3d7f4fa18..ad52533e9 100644 --- a/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java +++ b/ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java @@ -33,6 +33,6 @@ import javax.lang.model.SourceVersion; @SupportedSourceVersion(SourceVersion.RELEASE_16) public class SoundHandlerProcessor extends ClassProcessor { public SoundHandlerProcessor() { - super("org.geysermc.geyser.network.translators.sound.SoundHandler"); + super("org.geysermc.geyser.translator.sound.SoundTranslator"); } } diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java index d4714ab7c..ded11fd91 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.platform.bungeecord; import lombok.Getter; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.dump.BootstrapDumpInfo; import java.util.ArrayList; diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java index 497384ab1..389f0e37f 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java @@ -40,10 +40,10 @@ import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.netty.PipelineUtils; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; -import org.geysermc.geyser.common.connection.GeyserInjector; -import org.geysermc.geyser.common.connection.LocalServerChannelWrapper; -import org.geysermc.geyser.common.connection.LocalSession; +import org.geysermc.geyser.GeyserBootstrap; +import org.geysermc.geyser.network.netty.GeyserInjector; +import org.geysermc.geyser.network.netty.LocalServerChannelWrapper; +import org.geysermc.geyser.network.netty.LocalSession; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java index 587a26ca2..224c500a1 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java @@ -25,9 +25,9 @@ package org.geysermc.geyser.platform.bungeecord; -import org.geysermc.geyser.common.main.IGeyserMain; +import org.geysermc.geyser.GeyserMain; -public class GeyserBungeeMain extends IGeyserMain { +public class GeyserBungeeMain extends GeyserMain { public static void main(String[] args) { new GeyserBungeeMain().displayMessage(); diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java index 86cb21a42..393517aa2 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java @@ -34,7 +34,7 @@ import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.event.ProxyPingEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.protocol.ProtocolConstants; -import org.geysermc.geyser.common.ping.GeyserPingInfo; +import org.geysermc.geyser.ping.GeyserPingInfo; import org.geysermc.geyser.ping.IGeyserPingPassthrough; import java.net.InetSocketAddress; diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java index 9a7a8bc4d..26f7520f6 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java @@ -29,15 +29,15 @@ import net.md_5.bungee.api.config.ListenerInfo; import net.md_5.bungee.api.plugin.Plugin; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; +import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.command.CommandManager; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.platform.bungeecord.command.GeyserBungeeCommandExecutor; import org.geysermc.geyser.platform.bungeecord.command.GeyserBungeeCommandManager; import org.jetbrains.annotations.Nullable; @@ -72,7 +72,7 @@ public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap { File configFile = FileUtils.fileOrCopiedFromResource(new File(getDataFolder(), "config.yml"), "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString())); this.geyserConfig = FileUtils.loadConfig(configFile, GeyserBungeeConfiguration.class); } catch (IOException ex) { - getLogger().log(Level.WARNING, LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex); + getLogger().log(Level.WARNING, GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex); ex.printStackTrace(); } @@ -101,12 +101,12 @@ public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap { // Remove this in like a year if (getProxy().getPluginManager().getPlugin("floodgate-bungee") != null) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/")); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/")); return; } if (geyserConfig.getRemote().getAuthType() == AuthType.FLOODGATE && getProxy().getPluginManager().getPlugin("floodgate") == null) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); return; } else if (geyserConfig.isAutoconfiguredRemote() && getProxy().getPluginManager().getPlugin("floodgate") != null) { // Floodgate installed means that the user wants Floodgate authentication diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSender.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSender.java index 6e99c01e1..c7cd90489 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSender.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSender.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.platform.bungeecord.command; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; import org.geysermc.geyser.command.CommandSender; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; public class BungeeCommandSender implements CommandSender { @@ -37,7 +37,7 @@ public class BungeeCommandSender implements CommandSender { public BungeeCommandSender(net.md_5.bungee.api.CommandSender handle) { this.handle = handle; // Ensure even Java players' languages are loaded - LanguageUtils.loadGeyserLocale(getLocale()); + GeyserLocale.loadGeyserLocale(getLocale()); } @Override @@ -59,9 +59,9 @@ public class BungeeCommandSender implements CommandSender { public String getLocale() { if (handle instanceof ProxiedPlayer player) { String locale = player.getLocale().getLanguage() + "_" + player.getLocale().getCountry(); - return LanguageUtils.formatLocale(locale); + return GeyserLocale.formatLocale(locale); } - return LanguageUtils.getDefaultLocale(); + return GeyserLocale.getDefaultLocale(); } @Override diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java index 7b1fe0fc2..f0a05687c 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java @@ -32,8 +32,8 @@ import net.md_5.bungee.api.plugin.TabExecutor; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandExecutor; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Arrays; import java.util.Collections; @@ -56,13 +56,13 @@ public class GeyserBungeeCommandExecutor extends Command implements TabExecutor GeyserCommand command = this.commandExecutor.getCommand(args[0]); if (command != null) { if (!sender.hasPermission(command.getPermission())) { - String message = LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", commandSender.getLocale()); + String message = GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", commandSender.getLocale()); commandSender.sendMessage(ChatColor.RED + message); return; } if (command.isBedrockOnly() && session == null) { - String message = LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", commandSender.getLocale()); + String message = GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", commandSender.getLocale()); commandSender.sendMessage(ChatColor.RED + message); return; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java index 0acf3a422..189ca2356 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.platform.spigot; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.dump.BootstrapDumpInfo; import java.util.ArrayList; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java index 40ed05a15..7f390f9d8 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java @@ -31,9 +31,9 @@ import io.netty.channel.*; import io.netty.channel.local.LocalAddress; import io.netty.util.concurrent.DefaultThreadFactory; import org.bukkit.Bukkit; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; -import org.geysermc.geyser.common.connection.GeyserInjector; -import org.geysermc.geyser.common.connection.LocalServerChannelWrapper; +import org.geysermc.geyser.GeyserBootstrap; +import org.geysermc.geyser.network.netty.GeyserInjector; +import org.geysermc.geyser.network.netty.LocalServerChannelWrapper; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java index 777bd7169..5d18e4f94 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java @@ -25,9 +25,9 @@ package org.geysermc.geyser.platform.spigot; -import org.geysermc.geyser.common.main.IGeyserMain; +import org.geysermc.geyser.GeyserMain; -public class GeyserSpigotMain extends IGeyserMain { +public class GeyserSpigotMain extends GeyserMain { public static void main(String[] args) { new GeyserSpigotMain().displayMessage(); diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java index ff2855fe1..a6ec9e329 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java @@ -30,7 +30,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.server.ServerListPingEvent; import org.bukkit.util.CachedServerIcon; -import org.geysermc.geyser.common.ping.GeyserPingInfo; +import org.geysermc.geyser.ping.GeyserPingInfo; import org.geysermc.geyser.network.MinecraftProtocol; import org.geysermc.geyser.ping.IGeyserPingPassthrough; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java index 490268893..0b89580bb 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java @@ -33,18 +33,18 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; +import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.command.CommandManager; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.world.WorldManager; +import org.geysermc.geyser.level.WorldManager; import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.utils.Constants; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.Constants; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.adapters.spigot.SpigotAdapters; import org.geysermc.geyser.platform.spigot.command.GeyserSpigotCommandExecutor; import org.geysermc.geyser.platform.spigot.command.GeyserSpigotCommandManager; @@ -87,7 +87,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { File configFile = FileUtils.fileOrCopiedFromResource(new File(getDataFolder(), "config.yml"), "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString())); this.geyserConfig = FileUtils.loadConfig(configFile, GeyserSpigotConfiguration.class); } catch (IOException ex) { - getLogger().log(Level.WARNING, LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex); + getLogger().log(Level.WARNING, GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex); ex.printStackTrace(); } @@ -99,8 +99,8 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { // And since there are alternative ways to get Geyser working for these aging platforms, it's not worth it. getLogger().severe("*********************************************"); getLogger().severe(""); - getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.unsupported_server.header")); - getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.unsupported_server.message", "1.12.2")); + getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.header")); + getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.message", "1.12.2")); getLogger().severe(""); getLogger().severe("*********************************************"); @@ -127,13 +127,13 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { // Remove this in like a year if (Bukkit.getPluginManager().getPlugin("floodgate-bukkit") != null) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", Constants.FLOODGATE_DOWNLOAD_LOCATION)); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", Constants.FLOODGATE_DOWNLOAD_LOCATION)); this.getPluginLoader().disablePlugin(this); return; } if (geyserConfig.getRemote().getAuthType() == AuthType.FLOODGATE && Bukkit.getPluginManager().getPlugin("floodgate") == null) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); this.getPluginLoader().disablePlugin(this); return; } else if (geyserConfig.isAutoconfiguredRemote() && Bukkit.getPluginManager().getPlugin("floodgate") != null) { @@ -163,7 +163,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { // Ensure that we have the latest 4.0.0 changes and not an older ViaVersion version Class.forName("com.viaversion.viaversion.api.ViaManager"); } catch (ClassNotFoundException e) { - geyserLogger.warning(LanguageUtils.getLocaleStringLog("geyser.bootstrap.viaversion.too_old", + geyserLogger.warning(GeyserLocale.getLocaleStringLog("geyser.bootstrap.viaversion.too_old", "https://ci.viaversion.com/job/ViaVersion/")); isViaVersion = false; if (this.geyserConfig.isDebugMode()) { diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java index 35867ad15..af92091e5 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java @@ -32,8 +32,8 @@ import org.bukkit.command.TabExecutor; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandExecutor; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Arrays; import java.util.Collections; @@ -54,13 +54,13 @@ public class GeyserSpigotCommandExecutor extends CommandExecutor implements TabE GeyserCommand geyserCommand = getCommand(args[0]); if (geyserCommand != null) { if (!sender.hasPermission(geyserCommand.getPermission())) { - String message = LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", commandSender.getLocale()); + String message = GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", commandSender.getLocale()); commandSender.sendMessage(ChatColor.RED + message); return true; } if (geyserCommand.isBedrockOnly() && session == null) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", commandSender.getLocale())); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", commandSender.getLocale())); return true; } geyserCommand.execute(session, commandSender, args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]); diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSender.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSender.java index a871d1c18..2aa301022 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSender.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSender.java @@ -29,7 +29,7 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -50,7 +50,7 @@ public class SpigotCommandSender implements CommandSender { this.handle = handle; this.locale = getSpigotLocale(); // Ensure even Java players' languages are loaded - LanguageUtils.loadGeyserLocale(locale); + GeyserLocale.loadGeyserLocale(locale); } @Override @@ -114,6 +114,6 @@ public class SpigotCommandSender implements CommandSender { return player.getLocale(); } } - return LanguageUtils.getDefaultLocale(); + return GeyserLocale.getDefaultLocale(); } } diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java index 751e21ad8..4d504bcf5 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java @@ -41,11 +41,11 @@ import org.bukkit.event.block.BlockPistonEvent; import org.bukkit.event.block.BlockPistonExtendEvent; import org.bukkit.event.block.BlockPistonRetractEvent; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.PistonCache; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntity; -import org.geysermc.geyser.utils.Direction; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.PistonCache; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.translator.level.block.entity.PistonBlockEntity; +import org.geysermc.geyser.level.physics.Direction; import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotWorldManager; import java.util.List; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigot1_11CraftingListener.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigot1_11CraftingListener.java index 9fd0c5f73..2b740eead 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigot1_11CraftingListener.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigot1_11CraftingListener.java @@ -48,9 +48,9 @@ import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.util.InventoryUtils; import java.util.*; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java index 3b79666dc..b89e87878 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java @@ -33,8 +33,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPlaceEvent; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotWorldManager; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java index 5a603d3c7..ea1fadd0e 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java @@ -30,8 +30,8 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockSto import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.adapters.spigot.SpigotAdapters; import org.geysermc.geyser.adapters.spigot.SpigotWorldAdapter; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12WorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12WorldManager.java index f80d06c55..f12968b1f 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12WorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigot1_12WorldManager.java @@ -36,8 +36,8 @@ import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.List; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotFallbackWorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotFallbackWorldManager.java index 733a0291d..1aacb73e7 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotFallbackWorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotFallbackWorldManager.java @@ -26,8 +26,8 @@ package org.geysermc.geyser.platform.spigot.world.manager; import org.bukkit.plugin.Plugin; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; /** * Should only be used when we know {@link GeyserSpigotWorldManager#getBlockAt(GeyserSession, int, int, int)} diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java index 21988fa25..caeb257f7 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java @@ -33,7 +33,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntList; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.platform.spigot.GeyserSpigotPlugin; import java.util.List; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java index fa356b561..b1032671a 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java @@ -28,8 +28,8 @@ package org.geysermc.geyser.platform.spigot.world.manager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.adapters.spigot.SpigotAdapters; import org.geysermc.geyser.adapters.spigot.SpigotWorldAdapter; diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java index 804cdb7d3..8972b0ac6 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java @@ -39,13 +39,13 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.plugin.Plugin; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator; -import org.geysermc.geyser.network.translators.world.GeyserWorldManager; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.LecternInventoryTranslator; +import org.geysermc.geyser.level.GeyserWorldManager; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.BlockEntityUtils; -import org.geysermc.geyser.utils.GameRule; +import org.geysermc.geyser.util.BlockEntityUtils; +import org.geysermc.geyser.level.GameRule; import java.util.ArrayList; import java.util.List; diff --git a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongeMain.java b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongeMain.java index 999d1a635..c20b95cc1 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongeMain.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongeMain.java @@ -25,9 +25,9 @@ package org.geysermc.geyser.platform.sponge; -import org.geysermc.geyser.common.main.IGeyserMain; +import org.geysermc.geyser.GeyserMain; -public class GeyserSpongeMain extends IGeyserMain { +public class GeyserSpongeMain extends GeyserMain { public static void main(String[] args) { new GeyserSpongeMain().displayMessage(); diff --git a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePingPassthrough.java b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePingPassthrough.java index c22972441..dcdeb53f5 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePingPassthrough.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePingPassthrough.java @@ -25,7 +25,7 @@ package org.geysermc.geyser.platform.sponge; -import org.geysermc.geyser.common.ping.GeyserPingInfo; +import org.geysermc.geyser.ping.GeyserPingInfo; import org.geysermc.geyser.network.MinecraftProtocol; import org.geysermc.geyser.ping.IGeyserPingPassthrough; import org.spongepowered.api.MinecraftVersion; diff --git a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java index b3e416823..33b71fb63 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java @@ -28,14 +28,14 @@ package org.geysermc.geyser.platform.sponge; import com.google.inject.Inject; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; +import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.command.CommandManager; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.platform.sponge.command.GeyserSpongeCommandExecutor; import org.geysermc.geyser.platform.sponge.command.GeyserSpongeCommandManager; import org.slf4j.Logger; @@ -78,14 +78,14 @@ public class GeyserSpongePlugin implements GeyserBootstrap { try { configFile = FileUtils.fileOrCopiedFromResource(new File(configDir, "config.yml"), "config.yml", (file) -> file.replaceAll("generateduuid", UUID.randomUUID().toString())); } catch (IOException ex) { - logger.warn(LanguageUtils.getLocaleStringLog("geyser.config.failed")); + logger.warn(GeyserLocale.getLocaleStringLog("geyser.config.failed")); ex.printStackTrace(); } try { this.geyserConfig = FileUtils.loadConfig(configFile, GeyserSpongeConfiguration.class); } catch (IOException ex) { - logger.warn(LanguageUtils.getLocaleStringLog("geyser.config.failed")); + logger.warn(GeyserLocale.getLocaleStringLog("geyser.config.failed")); ex.printStackTrace(); return; } diff --git a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/command/GeyserSpongeCommandExecutor.java b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/command/GeyserSpongeCommandExecutor.java index faab87c6b..5b8496680 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/command/GeyserSpongeCommandExecutor.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/command/GeyserSpongeCommandExecutor.java @@ -29,9 +29,9 @@ import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandExecutor; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandResult; import org.spongepowered.api.command.CommandSource; @@ -62,11 +62,11 @@ public class GeyserSpongeCommandExecutor extends CommandExecutor implements Comm if (command != null) { if (!source.hasPermission(command.getPermission())) { // Not ideal to use log here but we dont get a session - source.sendMessage(Text.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail"))); + source.sendMessage(Text.of(ChatColor.RED + GeyserLocale.getLocaleStringLog("geyser.bootstrap.command.permission_fail"))); return CommandResult.success(); } if (command.isBedrockOnly() && session == null) { - source.sendMessage(Text.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"))); + source.sendMessage(Text.of(ChatColor.RED + GeyserLocale.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"))); return CommandResult.success(); } getCommand(args[0]).execute(session, commandSender, args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]); diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java index c4e3fcbc7..da215a399 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java @@ -40,15 +40,15 @@ import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; +import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.command.CommandManager; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.configuration.GeyserJacksonConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.platform.standalone.command.GeyserCommandManager; import org.geysermc.geyser.platform.standalone.gui.GeyserStandaloneGUI; @@ -102,19 +102,19 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { case "--nogui", "nogui" -> useGuiOpts = false; case "--config", "-c" -> { if (i >= args.length - 1) { - System.err.println(MessageFormat.format(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.config_not_specified"), "-c")); + System.err.println(MessageFormat.format(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.config_not_specified"), "-c")); return; } configFilenameOpt = args[i + 1]; i++; - System.out.println(MessageFormat.format(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.config_specified"), configFilenameOpt)); + System.out.println(MessageFormat.format(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.config_specified"), configFilenameOpt)); } case "--help", "-h" -> { - System.out.println(MessageFormat.format(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.usage"), "[java -jar] Geyser.jar [opts]")); - System.out.println(" " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.options")); - System.out.println(" -c, --config [file] " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.config")); - System.out.println(" -h, --help " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.help")); - System.out.println(" --gui, --nogui " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.gui")); + System.out.println(MessageFormat.format(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.usage"), "[java -jar] Geyser.jar [opts]")); + System.out.println(" " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.options")); + System.out.println(" -c, --config [file] " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.config")); + System.out.println(" -h, --help " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.help")); + System.out.println(" --gui, --nogui " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.gui")); return; } default -> { @@ -153,7 +153,7 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { } } } - System.err.println(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.unrecognised", arg)); + System.err.println(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.unrecognised", arg)); return; } } @@ -198,7 +198,7 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { geyserConfig.getRemote().setAddress("127.0.0.1"); } } catch (IOException ex) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex); if (gui == null) { System.exit(1); } else { @@ -345,7 +345,7 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { // Loop through the sub property if the first part matches for (BeanPropertyDefinition subProperty : getPOJOForClass(property.getRawPrimaryType())) { if (configKeyParts[1].equals(subProperty.getName())) { - geyserLogger.info(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.set_config_option", configKey.getKey(), configKey.getValue())); + geyserLogger.info(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.set_config_option", configKey.getKey(), configKey.getValue())); // Set the sub property value on the config try { @@ -359,7 +359,7 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { } } } else { - geyserLogger.info(LanguageUtils.getLocaleStringLog("geyser.bootstrap.args.set_config_option", configKey.getKey(), configKey.getValue())); + geyserLogger.info(GeyserLocale.getLocaleStringLog("geyser.bootstrap.args.set_config_option", configKey.getKey(), configKey.getValue())); // Set the property value on the config try { diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java index 3ba144b06..6aec896d1 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.Configurator; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; import org.geysermc.geyser.command.CommandSender; -import org.geysermc.geyser.common.ChatColor; +import org.geysermc.geyser.text.ChatColor; @Log4j2 public class GeyserStandaloneLogger extends SimpleTerminalConsole implements GeyserLogger, CommandSender { diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/LoopbackUtil.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/LoopbackUtil.java index 0b6a96304..d2b4656f0 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/LoopbackUtil.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/LoopbackUtil.java @@ -25,8 +25,8 @@ package org.geysermc.geyser.platform.standalone; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.text.GeyserLocale; import java.io.InputStream; import java.nio.file.Files; @@ -56,12 +56,12 @@ public class LoopbackUtil { Files.write(Paths.get(System.getenv("temp") + "/loopback_minecraft.bat"), loopbackCommand.getBytes()); Runtime.getRuntime().exec(startScript); - geyserLogger.info(ChatColor.AQUA + LanguageUtils.getLocaleStringLog("geyser.bootstrap.loopback.added")); + geyserLogger.info(ChatColor.AQUA + GeyserLocale.getLocaleStringLog("geyser.bootstrap.loopback.added")); } } catch (Exception e) { e.printStackTrace(); - geyserLogger.error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.loopback.failed")); + geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.loopback.failed")); } } } diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/gui/GeyserStandaloneGUI.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/gui/GeyserStandaloneGUI.java index 7f998619f..56d211986 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/gui/GeyserStandaloneGUI.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/gui/GeyserStandaloneGUI.java @@ -27,8 +27,8 @@ package org.geysermc.geyser.platform.standalone.gui; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.platform.standalone.GeyserStandaloneLogger; import org.geysermc.geyser.platform.standalone.command.GeyserCommandManager; @@ -67,7 +67,7 @@ public class GeyserStandaloneGUI { public GeyserStandaloneGUI() { // Create the frame and setup basic settings - JFrame frame = new JFrame(LanguageUtils.getLocaleStringLog("geyser.gui.title")); + JFrame frame = new JFrame(GeyserLocale.getLocaleStringLog("geyser.gui.title")); frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); frame.setSize(800, 400); frame.setMinimumSize(frame.getSize()); @@ -82,8 +82,8 @@ public class GeyserStandaloneGUI { @Override public void windowClosing(WindowEvent we) { - String[] buttons = {LanguageUtils.getLocaleStringLog("geyser.gui.exit.confirm"), LanguageUtils.getLocaleStringLog("geyser.gui.exit.deny")}; - int result = JOptionPane.showOptionDialog(frame, LanguageUtils.getLocaleStringLog("geyser.gui.exit.message"), frame.getTitle(), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, buttons, buttons[1]); + String[] buttons = {GeyserLocale.getLocaleStringLog("geyser.gui.exit.confirm"), GeyserLocale.getLocaleStringLog("geyser.gui.exit.deny")}; + int result = JOptionPane.showOptionDialog(frame, GeyserLocale.getLocaleStringLog("geyser.gui.exit.message"), frame.getTitle(), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, buttons, buttons[1]); if (result == JOptionPane.YES_OPTION) { System.exit(0); } @@ -124,12 +124,12 @@ public class GeyserStandaloneGUI { JMenuBar menuBar = new JMenuBar(); // Create 'File' - JMenu fileMenu = new JMenu(LanguageUtils.getLocaleStringLog("geyser.gui.menu.file")); + JMenu fileMenu = new JMenu(GeyserLocale.getLocaleStringLog("geyser.gui.menu.file")); fileMenu.setMnemonic(KeyEvent.VK_F); menuBar.add(fileMenu); // 'Open Geyser folder' button - JMenuItem openButton = new JMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.file.open_folder"), KeyEvent.VK_O); + JMenuItem openButton = new JMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.file.open_folder"), KeyEvent.VK_O); openButton.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_MASK)); openButton.addActionListener(e -> { try { @@ -141,40 +141,40 @@ public class GeyserStandaloneGUI { fileMenu.addSeparator(); // 'Exit' button - JMenuItem exitButton = new JMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.file.exit"), KeyEvent.VK_X); + JMenuItem exitButton = new JMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.file.exit"), KeyEvent.VK_X); exitButton.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.ALT_MASK)); exitButton.addActionListener(e -> System.exit(0)); fileMenu.add(exitButton); // Create 'Commands' - commandsMenu = new JMenu(LanguageUtils.getLocaleStringLog("geyser.gui.menu.commands")); + commandsMenu = new JMenu(GeyserLocale.getLocaleStringLog("geyser.gui.menu.commands")); commandsMenu.setMnemonic(KeyEvent.VK_C); menuBar.add(commandsMenu); // Create 'View' - JMenu viewMenu = new JMenu(LanguageUtils.getLocaleStringLog("geyser.gui.menu.view")); + JMenu viewMenu = new JMenu(GeyserLocale.getLocaleStringLog("geyser.gui.menu.view")); viewMenu.setMnemonic(KeyEvent.VK_V); menuBar.add(viewMenu); // 'Zoom in' button - JMenuItem zoomInButton = new JMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.view.zoom_in")); + JMenuItem zoomInButton = new JMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.view.zoom_in")); zoomInButton.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_DOWN_MASK)); zoomInButton.addActionListener(e -> consolePane.setFont(new Font(consolePane.getFont().getName(), consolePane.getFont().getStyle(), consolePane.getFont().getSize() + 1))); viewMenu.add(zoomInButton); // 'Zoom in' button - JMenuItem zoomOutButton = new JMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.view.zoom_out")); + JMenuItem zoomOutButton = new JMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.view.zoom_out")); zoomOutButton.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_DOWN_MASK)); zoomOutButton.addActionListener(e -> consolePane.setFont(new Font(consolePane.getFont().getName(), consolePane.getFont().getStyle(), consolePane.getFont().getSize() - 1))); viewMenu.add(zoomOutButton); // 'Reset Zoom' button - JMenuItem resetZoomButton = new JMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.view.reset_zoom")); + JMenuItem resetZoomButton = new JMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.view.reset_zoom")); resetZoomButton.addActionListener(e -> consolePane.setFont(new Font(consolePane.getFont().getName(), consolePane.getFont().getStyle(), originalFontSize))); viewMenu.add(resetZoomButton); // create 'Options' - optionsMenu = new JMenu(LanguageUtils.getLocaleStringLog("geyser.gui.menu.options")); + optionsMenu = new JMenu(GeyserLocale.getLocaleStringLog("geyser.gui.menu.options")); viewMenu.setMnemonic(KeyEvent.VK_O); menuBar.add(optionsMenu); @@ -195,11 +195,11 @@ public class GeyserStandaloneGUI { ramValues.add(0); } ramGraph.setValues(ramValues); - ramGraph.setXLabel(LanguageUtils.getLocaleStringLog("geyser.gui.graph.loading")); + ramGraph.setXLabel(GeyserLocale.getLocaleStringLog("geyser.gui.graph.loading")); rightContentPane.add(ramGraph); - playerTableModel.addColumn(LanguageUtils.getLocaleStringLog("geyser.gui.table.ip")); - playerTableModel.addColumn(LanguageUtils.getLocaleStringLog("geyser.gui.table.username")); + playerTableModel.addColumn(GeyserLocale.getLocaleStringLog("geyser.gui.table.ip")); + playerTableModel.addColumn(GeyserLocale.getLocaleStringLog("geyser.gui.table.username")); JScrollPane playerScrollPane = new JScrollPane(playerTable); rightContentPane.add(playerScrollPane); @@ -289,7 +289,7 @@ public class GeyserStandaloneGUI { } // 'Debug Mode' toggle - JCheckBoxMenuItem debugMode = new JCheckBoxMenuItem(LanguageUtils.getLocaleStringLog("geyser.gui.menu.options.toggle_debug_mode")); + JCheckBoxMenuItem debugMode = new JCheckBoxMenuItem(GeyserLocale.getLocaleStringLog("geyser.gui.menu.options.toggle_debug_mode")); debugMode.setSelected(geyserStandaloneLogger.isDebug()); debugMode.addActionListener(e -> geyserStandaloneLogger.setDebug(!geyserStandaloneLogger.isDebug())); optionsMenu.add(debugMode); @@ -323,7 +323,7 @@ public class GeyserStandaloneGUI { final int freePercent = (int)(freeMemory * 100.0 / totalMemory + 0.5); ramValues.add(100 - freePercent); - ramGraph.setXLabel(LanguageUtils.getLocaleStringLog("geyser.gui.graph.usage", String.format("%,d", (totalMemory - freeMemory) / MEGABYTE), freePercent)); + ramGraph.setXLabel(GeyserLocale.getLocaleStringLog("geyser.gui.graph.usage", String.format("%,d", (totalMemory - freeMemory) / MEGABYTE), freePercent)); // Trim the list int k = ramValues.size(); diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java index f587c3aa8..c2d6d12a0 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.platform.velocity; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.proxy.ProxyServer; import lombok.Getter; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.dump.BootstrapDumpInfo; import java.util.ArrayList; diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java index 368c64e67..27cf9e815 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java @@ -29,9 +29,9 @@ import com.velocitypowered.api.proxy.ProxyServer; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.local.LocalAddress; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; -import org.geysermc.geyser.common.connection.GeyserInjector; -import org.geysermc.geyser.common.connection.LocalServerChannelWrapper; +import org.geysermc.geyser.GeyserBootstrap; +import org.geysermc.geyser.network.netty.GeyserInjector; +import org.geysermc.geyser.network.netty.LocalServerChannelWrapper; import java.lang.reflect.Field; import java.util.function.Supplier; diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java index e5f56226a..35408ce9c 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java @@ -25,9 +25,9 @@ package org.geysermc.geyser.platform.velocity; -import org.geysermc.geyser.common.main.IGeyserMain; +import org.geysermc.geyser.GeyserMain; -public class GeyserVelocityMain extends IGeyserMain { +public class GeyserVelocityMain extends GeyserMain { public static void main(String[] args) { new GeyserVelocityMain().displayMessage(); diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java index 37d6e8ba2..a567233db 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java @@ -32,7 +32,7 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.ServerPing; import lombok.AllArgsConstructor; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import org.geysermc.geyser.common.ping.GeyserPingInfo; +import org.geysermc.geyser.ping.GeyserPingInfo; import org.geysermc.geyser.ping.IGeyserPingPassthrough; import java.net.InetSocketAddress; diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java index aa4261ad2..5666fff7f 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java @@ -37,16 +37,16 @@ import com.velocitypowered.api.proxy.ProxyServer; import lombok.Getter; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.GeyserBootstrap; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; import org.geysermc.geyser.ping.IGeyserPingPassthrough; import org.geysermc.geyser.platform.velocity.command.GeyserVelocityCommandExecutor; import org.geysermc.geyser.platform.velocity.command.GeyserVelocityCommandManager; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -91,7 +91,7 @@ public class GeyserVelocityPlugin implements GeyserBootstrap { "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString())); this.geyserConfig = FileUtils.loadConfig(configFile, GeyserVelocityConfiguration.class); } catch (IOException ex) { - logger.warn(LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex); + logger.warn(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex); ex.printStackTrace(); } @@ -118,15 +118,15 @@ public class GeyserVelocityPlugin implements GeyserBootstrap { try { // Should only exist on 1.0 Class.forName("org.geysermc.floodgate.FloodgateAPI"); - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/")); return; } catch (ClassNotFoundException ignored) { } if (geyserConfig.getRemote().getAuthType() == AuthType.FLOODGATE && proxyServer.getPluginManager().getPlugin("floodgate").isEmpty()) { - geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " - + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); + geyserLogger.severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + + GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.disabling")); return; } else if (geyserConfig.isAutoconfiguredRemote() && proxyServer.getPluginManager().getPlugin("floodgate").isPresent()) { // Floodgate installed means that the user wants Floodgate authentication diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java index b4a1e5963..1034d6062 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java @@ -30,9 +30,9 @@ import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandExecutor; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Arrays; import java.util.Collections; @@ -53,11 +53,11 @@ public class GeyserVelocityCommandExecutor extends CommandExecutor implements Si GeyserCommand command = getCommand(invocation.arguments()[0]); if (command != null) { if (!invocation.source().hasPermission(getCommand(invocation.arguments()[0]).getPermission())) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); return; } if (command.isBedrockOnly() && session == null) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", sender.getLocale())); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.bedrock_only", sender.getLocale())); return; } command.execute(session, sender, invocation.arguments().length > 1 ? Arrays.copyOfRange(invocation.arguments(), 1, invocation.arguments().length) : new String[0]); diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSender.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSender.java index d45af5306..48edb71b1 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSender.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSender.java @@ -30,7 +30,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.geysermc.geyser.command.CommandSender; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Locale; @@ -41,7 +41,7 @@ public class VelocityCommandSender implements CommandSender { public VelocityCommandSender(CommandSource handle) { this.handle = handle; // Ensure even Java players' languages are loaded - LanguageUtils.loadGeyserLocale(getLocale()); + GeyserLocale.loadGeyserLocale(getLocale()); } @Override @@ -68,9 +68,9 @@ public class VelocityCommandSender implements CommandSender { public String getLocale() { if (handle instanceof Player) { Locale locale = ((Player) handle).getPlayerSettings().getLocale(); - return LanguageUtils.formatLocale(locale.getLanguage() + "_" + locale.getCountry()); + return GeyserLocale.formatLocale(locale.getLanguage() + "_" + locale.getCountry()); } - return LanguageUtils.getDefaultLocale(); + return GeyserLocale.getDefaultLocale(); } @Override diff --git a/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index aca167482..07b7a3298 100644 --- a/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -37,9 +37,9 @@ import org.geysermc.connector.network.session.auth.AuthData; */ @Deprecated public class GeyserSession { - private final org.geysermc.geyser.network.session.GeyserSession handle; + private final org.geysermc.geyser.session.GeyserSession handle; - public GeyserSession(org.geysermc.geyser.network.session.GeyserSession handle) { + public GeyserSession(org.geysermc.geyser.session.GeyserSession handle) { this.handle = handle; } diff --git a/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java b/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java index d1871d4c3..19e6131bc 100644 --- a/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java +++ b/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java @@ -34,9 +34,9 @@ import java.util.UUID; * @deprecated legacy code */ public class AuthData { - private final org.geysermc.geyser.network.session.auth.AuthData handle; + private final org.geysermc.geyser.session.auth.AuthData handle; - public AuthData(org.geysermc.geyser.network.session.auth.AuthData handle) { + public AuthData(org.geysermc.geyser.session.auth.AuthData handle) { this.handle = handle; } diff --git a/core/src/main/java/org/geysermc/geyser/utils/Constants.java b/core/src/main/java/org/geysermc/geyser/Constants.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/Constants.java rename to core/src/main/java/org/geysermc/geyser/Constants.java index fb918590d..23029d195 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/Constants.java +++ b/core/src/main/java/org/geysermc/geyser/Constants.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser; import java.net.URI; import java.net.URISyntaxException; diff --git a/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java b/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java index de0797fc1..4bed3aaca 100644 --- a/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java +++ b/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java @@ -26,9 +26,9 @@ package org.geysermc.geyser; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserJacksonConfiguration; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.nio.file.Files; import java.nio.file.Path; @@ -44,10 +44,10 @@ public class FloodgateKeyLoader { if (floodgateDataFolder != null) { Path autoKey = floodgateDataFolder.resolve("key.pem"); if (Files.exists(autoKey)) { - logger.info(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.auto_loaded")); + logger.info(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.auto_loaded")); return autoKey; } else { - logger.error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.missing_key")); + logger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.missing_key")); } } @@ -60,7 +60,7 @@ public class FloodgateKeyLoader { } if (!Files.exists(floodgateKey)) { - logger.error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed")); + logger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed")); } return floodgateKey; diff --git a/core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java b/core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java rename to core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java index 65c171453..1411c0175 100644 --- a/core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java @@ -23,16 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.bootstrap; +package org.geysermc.geyser; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.api.logger.GeyserLogger; import org.geysermc.geyser.command.CommandManager; -import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.dump.BootstrapDumpInfo; -import org.geysermc.geyser.network.translators.world.GeyserWorldManager; -import org.geysermc.geyser.network.translators.world.WorldManager; +import org.geysermc.geyser.level.GeyserWorldManager; +import org.geysermc.geyser.level.WorldManager; import org.geysermc.geyser.ping.IGeyserPingPassthrough; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java index 3efa35f1f..546602162 100644 --- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java @@ -42,23 +42,25 @@ import lombok.Setter; import org.geysermc.common.PlatformType; import org.geysermc.geyser.api.Geyser; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; import org.geysermc.geyser.command.CommandManager; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.metrics.Metrics; +import org.geysermc.geyser.pack.ResourcePack; +import org.geysermc.geyser.session.SessionManager; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.text.MinecraftLocale; +import org.geysermc.geyser.util.Metrics; import org.geysermc.geyser.network.ConnectorServerEventHandler; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslatorRegistry; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.network.translators.world.WorldManager; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.level.WorldManager; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.scoreboard.ScoreboardUpdater; import org.geysermc.geyser.skin.FloodgateSkinUploader; -import org.geysermc.geyser.utils.*; +import org.geysermc.geyser.util.*; import org.geysermc.floodgate.crypto.AesCipher; import org.geysermc.floodgate.crypto.AesKeyProducer; import org.geysermc.floodgate.crypto.Base64Topping; @@ -140,7 +142,7 @@ public class GeyserImpl extends Geyser { logger.info("******************************************"); logger.info(""); - logger.info(LanguageUtils.getLocaleStringLog("geyser.core.load", NAME, VERSION)); + logger.info(GeyserLocale.getLocaleStringLog("geyser.core.load", NAME, VERSION)); logger.info(""); logger.info("******************************************"); @@ -148,8 +150,6 @@ public class GeyserImpl extends Geyser { logger.setDebug(config.isDebugMode()); - PacketTranslatorRegistry.init(); - /* Initialize translators and registries */ BlockRegistries.init(); Registries.init(); @@ -157,7 +157,7 @@ public class GeyserImpl extends Geyser { EntityDefinitions.init(); ItemTranslator.init(); MessageTranslator.init(); - LocaleUtils.init(); + MinecraftLocale.init(); ScoreboardUpdater.init(); ResourcePack.loadPacks(); @@ -207,10 +207,10 @@ public class GeyserImpl extends Geyser { Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath()); cipher = new AesCipher(new Base64Topping()); cipher.init(key); - logger.info(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.loaded_key")); + logger.info(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.loaded_key")); skinUploader = new FloodgateSkinUploader(this).start(); } catch (Exception exception) { - logger.severe(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.bad_key"), exception); + logger.severe(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.bad_key"), exception); } } this.timeSyncer = timeSyncer; @@ -272,9 +272,9 @@ public class GeyserImpl extends Geyser { if (shouldStartListener) { bedrockServer.bind().whenComplete((avoid, throwable) -> { if (throwable == null) { - logger.info(LanguageUtils.getLocaleStringLog("geyser.core.start", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort()))); + logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort()))); } else { - logger.severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort()))); + logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort()))); throwable.printStackTrace(); } }).join(); @@ -286,7 +286,7 @@ public class GeyserImpl extends Geyser { // Prevent unwanted words best we can metrics.addCustomChart(new Metrics.SimplePie("authMode", () -> config.getRemote().getAuthType().toString().toLowerCase())); metrics.addCustomChart(new Metrics.SimplePie("platform", platformType::getPlatformName)); - metrics.addCustomChart(new Metrics.SimplePie("defaultLocale", LanguageUtils::getDefaultLocale)); + metrics.addCustomChart(new Metrics.SimplePie("defaultLocale", GeyserLocale::getDefaultLocale)); metrics.addCustomChart(new Metrics.SimplePie("version", () -> GeyserImpl.VERSION)); metrics.addCustomChart(new Metrics.AdvancedPie("playerPlatform", () -> { Map valueMap = new HashMap<>(); @@ -380,29 +380,29 @@ public class GeyserImpl extends Geyser { } double completeTime = (System.currentTimeMillis() - startupTime) / 1000D; - String message = LanguageUtils.getLocaleStringLog("geyser.core.finish.done", new DecimalFormat("#.###").format(completeTime)) + " "; + String message = GeyserLocale.getLocaleStringLog("geyser.core.finish.done", new DecimalFormat("#.###").format(completeTime)) + " "; if (isGui) { - message += LanguageUtils.getLocaleStringLog("geyser.core.finish.gui"); + message += GeyserLocale.getLocaleStringLog("geyser.core.finish.gui"); } else { - message += LanguageUtils.getLocaleStringLog("geyser.core.finish.console"); + message += GeyserLocale.getLocaleStringLog("geyser.core.finish.console"); } logger.info(message); if (platformType == PlatformType.STANDALONE) { - logger.warning(LanguageUtils.getLocaleStringLog("geyser.core.movement_warn")); + logger.warning(GeyserLocale.getLocaleStringLog("geyser.core.movement_warn")); } newsHandler.handleNews(null, NewsItemAction.ON_SERVER_STARTED); } public void shutdown() { - bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown")); + bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown")); shuttingDown = true; if (sessionManager.size() >= 1) { - bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.log", sessionManager.size())); + bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.kick.log", sessionManager.size())); sessionManager.disconnectAll("geyser.core.shutdown.kick.message"); - bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.done")); + bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.kick.done")); } scheduledThread.shutdown(); @@ -416,7 +416,7 @@ public class GeyserImpl extends Geyser { newsHandler.shutdown(); this.getCommandManager().getCommands().clear(); - bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.done")); + bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.done")); } /** @@ -442,12 +442,7 @@ public class GeyserImpl extends Geyser { */ @SuppressWarnings("unused") // API usage public GeyserSession getPlayerByXuid(String xuid) { - for (GeyserSession session : sessionManager.getPendingSessions()) { - if (session.getAuthData().getXuid().equals(xuid)) { - return session; - } - } - for (GeyserSession session : sessionManager.getSessions().values()) { + for (GeyserSession session : sessionManager.getAllSessions()) { if (session.getAuthData().getXuid().equals(xuid)) { return session; } diff --git a/core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java b/core/src/main/java/org/geysermc/geyser/GeyserMain.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java rename to core/src/main/java/org/geysermc/geyser/GeyserMain.java index bb70012cc..9ddbbbe86 100644 --- a/core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserMain.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.main; +package org.geysermc.geyser; import javax.swing.*; import java.io.InputStream; @@ -31,7 +31,7 @@ import java.lang.reflect.Method; import java.util.Locale; import java.util.Scanner; -public class IGeyserMain { +public class GeyserMain { /** * Displays the run help message in the console and a message box if running with a gui @@ -54,10 +54,10 @@ public class IGeyserMain { private String createMessage() { StringBuilder message = new StringBuilder(); - InputStream helpStream = IGeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/" + Locale.getDefault().toString() + ".txt"); + InputStream helpStream = GeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/" + Locale.getDefault().toString() + ".txt"); if (helpStream == null) { - helpStream = IGeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/en_US.txt"); + helpStream = GeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/en_US.txt"); } Scanner help = new Scanner(helpStream).useDelimiter("\\Z"); diff --git a/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java b/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java index 43bf22478..8e970d6a0 100644 --- a/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java +++ b/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java @@ -27,7 +27,7 @@ package org.geysermc.geyser.command; import lombok.AllArgsConstructor; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/command/CommandManager.java b/core/src/main/java/org/geysermc/geyser/command/CommandManager.java index 7af5f93fd..19b521ed6 100644 --- a/core/src/main/java/org/geysermc/geyser/command/CommandManager.java +++ b/core/src/main/java/org/geysermc/geyser/command/CommandManager.java @@ -30,8 +30,8 @@ import lombok.Getter; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.defaults.*; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.*; @@ -61,7 +61,7 @@ public abstract class CommandManager { public void registerCommand(GeyserCommand command) { commands.put(command.getName(), command); - geyser.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.commands.registered", command.getName())); + geyser.getLogger().debug(GeyserLocale.getLocaleStringLog("geyser.commands.registered", command.getName())); if (command.getAliases().isEmpty()) return; @@ -89,7 +89,7 @@ public abstract class CommandManager { GeyserCommand cmd = commands.get(label); if (cmd == null) { - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.invalid")); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.invalid")); return; } @@ -99,7 +99,7 @@ public abstract class CommandManager { if (!cmd.isBedrockOnly()) { cmd.execute(null, sender, args); } else { - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.bedrock_only")); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.command.bedrock_only")); } } } diff --git a/core/src/main/java/org/geysermc/geyser/command/CommandSender.java b/core/src/main/java/org/geysermc/geyser/command/CommandSender.java index fc9a0be24..47881868f 100644 --- a/core/src/main/java/org/geysermc/geyser/command/CommandSender.java +++ b/core/src/main/java/org/geysermc/geyser/command/CommandSender.java @@ -25,7 +25,7 @@ package org.geysermc.geyser.command; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; /** * Implemented on top of any class that can send a command. @@ -49,12 +49,12 @@ public interface CommandSender { boolean isConsole(); /** - * Returns the locale of the command sender. Defaults to the default locale at {@link LanguageUtils#getDefaultLocale()}. + * Returns the locale of the command sender. Defaults to the default locale at {@link GeyserLocale#getDefaultLocale()}. * * @return the locale of the command sender. */ default String getLocale() { - return LanguageUtils.getDefaultLocale(); + return GeyserLocale.getDefaultLocale(); } /** diff --git a/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java index af462192f..6971ad44d 100644 --- a/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.command; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java index 11dd28199..41bb8e6cd 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java @@ -27,7 +27,7 @@ package org.geysermc.geyser.command.defaults; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class AdvancementsCommand extends GeyserCommand { public AdvancementsCommand(String name, String description, String permission) { diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java index 0926b97c3..64ad6e216 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java @@ -33,12 +33,12 @@ import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.dump.DumpInfo; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; -import org.geysermc.geyser.utils.WebUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.util.WebUtils; import java.io.FileOutputStream; import java.io.IOException; @@ -61,7 +61,7 @@ public class DumpCommand extends GeyserCommand { public void execute(GeyserSession session, CommandSender sender, String[] args) { // Only allow the console to create dumps on Geyser Standalone if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); return; } @@ -80,7 +80,7 @@ public class DumpCommand extends GeyserCommand { AsteriskSerializer.showSensitive = showSensitive; - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.collecting", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.collecting", sender.getLocale())); String dumpData; try { if (offlineDump) { @@ -92,29 +92,29 @@ public class DumpCommand extends GeyserCommand { dumpData = MAPPER.writeValueAsString(new DumpInfo(addLog)); } } catch (IOException e) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.collect_error", sender.getLocale())); - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.collect_error", sender.getLocale())); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e); return; } String uploadedDumpUrl = ""; if (offlineDump) { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.writing", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.writing", sender.getLocale())); try { FileOutputStream outputStream = new FileOutputStream(GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("dump.json").toFile()); outputStream.write(dumpData.getBytes()); outputStream.close(); } catch (IOException e) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.write_error", sender.getLocale())); - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.write_error_short"), e); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.write_error", sender.getLocale())); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.write_error_short"), e); return; } uploadedDumpUrl = "dump.json"; } else { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.uploading", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.uploading", sender.getLocale())); String response; JsonNode responseNode; @@ -122,22 +122,22 @@ public class DumpCommand extends GeyserCommand { response = WebUtils.post(DUMP_URL + "documents", dumpData); responseNode = MAPPER.readTree(response); } catch (IOException e) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.upload_error", sender.getLocale())); - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error", sender.getLocale())); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e); return; } if (!responseNode.has("key")) { - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.upload_error_short", sender.getLocale()) + ": " + (responseNode.has("message") ? responseNode.get("message").asText() : response)); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error_short", sender.getLocale()) + ": " + (responseNode.has("message") ? responseNode.get("message").asText() : response)); return; } uploadedDumpUrl = DUMP_URL + responseNode.get("key").asText(); } - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.message", sender.getLocale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.message", sender.getLocale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl); if (!sender.isConsole()) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl)); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl)); } } diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java index 00e18cf0a..4d4a21319 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java @@ -28,9 +28,9 @@ package org.geysermc.geyser.command.defaults; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Collections; import java.util.Map; @@ -56,7 +56,7 @@ public class HelpCommand extends GeyserCommand { public void execute(GeyserSession session, CommandSender sender, String[] args) { int page = 1; int maxPage = 1; - String header = LanguageUtils.getPlayerLocaleString("geyser.commands.help.header", sender.getLocale(), page, maxPage); + String header = GeyserLocale.getPlayerLocaleString("geyser.commands.help.header", sender.getLocale(), page, maxPage); sender.sendMessage(header); Map cmds = geyser.getCommandManager().getCommands(); @@ -70,7 +70,7 @@ public class HelpCommand extends GeyserCommand { } sender.sendMessage(ChatColor.YELLOW + "/geyser " + cmdName + ChatColor.WHITE + ": " + - LanguageUtils.getPlayerLocaleString(cmd.getDescription(), sender.getLocale())); + GeyserLocale.getPlayerLocaleString(cmd.getDescription(), sender.getLocale())); } } } diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java index 4f4b610d1..1da6b79c2 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java @@ -28,8 +28,8 @@ package org.geysermc.geyser.command.defaults; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.stream.Collectors; @@ -45,7 +45,7 @@ public class ListCommand extends GeyserCommand { @Override public void execute(GeyserSession session, CommandSender sender, String[] args) { - String message = LanguageUtils.getPlayerLocaleString("geyser.commands.list.message", sender.getLocale(), + String message = GeyserLocale.getPlayerLocaleString("geyser.commands.list.message", sender.getLocale(), geyser.getSessionManager().size(), geyser.getSessionManager().getAllSessions().stream().map(GeyserSession::getName).collect(Collectors.joining(" "))); diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java index c9a5b818e..934cd8c87 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java @@ -31,8 +31,8 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.Server import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.BlockUtils; public class OffhandCommand extends GeyserCommand { diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java index d8ceda637..1a72e1734 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java @@ -29,8 +29,8 @@ import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; public class ReloadCommand extends GeyserCommand { @@ -47,7 +47,7 @@ public class ReloadCommand extends GeyserCommand { return; } - String message = LanguageUtils.getPlayerLocaleString("geyser.commands.reload.message", sender.getLocale()); + String message = GeyserLocale.getPlayerLocaleString("geyser.commands.reload.message", sender.getLocale()); sender.sendMessage(message); diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java index ec561b6ff..349f7288b 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java @@ -28,8 +28,8 @@ package org.geysermc.geyser.command.defaults; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.SettingsUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.SettingsUtils; public class SettingsCommand extends GeyserCommand { public SettingsCommand(GeyserImpl geyser, String name, String description, String permission) { diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java index c925c73b0..c570770b7 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java @@ -30,7 +30,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCl import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class StatisticsCommand extends GeyserCommand { diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java index 23d9a88d7..6b74f9c8b 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java @@ -29,8 +29,8 @@ import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Collections; @@ -48,7 +48,7 @@ public class StopCommand extends GeyserCommand { @Override public void execute(GeyserSession session, CommandSender sender, String[] args) { if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale())); return; } diff --git a/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java index e3530071d..ff80abba3 100644 --- a/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java +++ b/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java @@ -30,12 +30,12 @@ import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; import org.geysermc.geyser.command.GeyserCommand; -import org.geysermc.geyser.common.ChatColor; +import org.geysermc.geyser.text.ChatColor; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; -import org.geysermc.geyser.utils.WebUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.util.WebUtils; import java.io.IOException; import java.net.URLEncoder; @@ -63,12 +63,12 @@ public class VersionCommand extends GeyserCommand { bedrockVersions = MinecraftProtocol.SUPPORTED_BEDROCK_CODECS.get(0).getMinecraftVersion(); } - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(), + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(), GeyserImpl.NAME, GeyserImpl.VERSION, MinecraftProtocol.getJavaVersion(), bedrockVersions)); // Disable update checking in dev mode and for players in Geyser Standalone if (GeyserImpl.getInstance().isProductionEnvironment() && !(!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale())); try { Properties gitProp = new Properties(); gitProp.load(FileUtils.getResource("git.properties")); @@ -79,17 +79,17 @@ public class VersionCommand extends GeyserCommand { int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?(/)?buildNumber>", "").trim()); int buildNum = Integer.parseInt(gitProp.getProperty("git.build.number")); if (latestBuildNum == buildNum) { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.no_updates", sender.getLocale())); + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.no_updates", sender.getLocale())); } else { - sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.outdated", + sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.outdated", sender.getLocale(), (latestBuildNum - buildNum), "https://ci.geysermc.org/")); } } else { throw new AssertionError("buildNumber missing"); } } catch (IOException | AssertionError | NumberFormatException e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"), e); - sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.version.failed", sender.getLocale())); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.version.failed"), e); + sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.version.failed", sender.getLocale())); } } } diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java index b9e735c94..eb6b68f78 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java @@ -27,10 +27,9 @@ package org.geysermc.geyser.configuration; import com.fasterxml.jackson.annotation.JsonIgnore; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.network.CIDRMatcher; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.nio.file.Path; import java.util.List; @@ -174,9 +173,9 @@ public interface GeyserConfiguration { static void checkGeyserConfiguration(GeyserConfiguration geyserConfig, GeyserLogger geyserLogger) { if (geyserConfig.getConfigVersion() < CURRENT_CONFIG_VERSION) { - geyserLogger.warning(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.outdated")); + geyserLogger.warning(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.outdated")); } else if (geyserConfig.getConfigVersion() > CURRENT_CONFIG_VERSION) { - geyserLogger.warning(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.too_new")); + geyserLogger.warning(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.too_new")); } } } diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java index 9c5fc229f..e3c937aae 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java @@ -35,10 +35,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Getter; import lombok.Setter; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.network.CIDRMatcher; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.io.IOException; import java.nio.file.Path; @@ -257,7 +257,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration try { return Integer.parseInt(value); } catch (NumberFormatException e) { - System.err.println(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.invalid_port")); + System.err.println(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.invalid_port")); return 25565; } } diff --git a/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java b/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java index a6cc971ea..5a77b84fb 100644 --- a/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java +++ b/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java @@ -36,13 +36,12 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import lombok.AllArgsConstructor; import lombok.Getter; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.serializer.AsteriskSerializer; +import org.geysermc.geyser.text.AsteriskSerializer; import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.DockerCheck; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.WebUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.util.WebUtils; import org.geysermc.floodgate.util.DeviceOs; import org.geysermc.floodgate.util.FloodgateInfoHolder; @@ -53,6 +52,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.UnknownHostException; +import java.nio.file.Paths; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -177,7 +177,24 @@ public class DumpInfo { this.internalIP = "***"; } - this.dockerCheck = DockerCheck.checkBasic(); + this.dockerCheck = checkDockerBasic(); + } + + // By default, Geyser now sets the IP to the local IP in all cases on plugin versions so we don't notify the user of anything + // However we still have this check for the potential future bug + private boolean checkDockerBasic() { + try { + String OS = System.getProperty("os.name").toLowerCase(); + if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) { + String output = new String(java.nio.file.Files.readAllBytes(Paths.get("/proc/1/cgroup"))); + + if (output.contains("docker")) { + return true; + } + } + } catch (Exception ignored) { } // Ignore any errors, inc ip failed to fetch, process could not run or access denied + + return false; } } diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java index 31190d892..1149a67fd 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java +++ b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java @@ -34,7 +34,9 @@ import lombok.experimental.Accessors; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.entity.factory.BaseEntityFactory; import org.geysermc.geyser.entity.factory.EntityFactory; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.registry.Registries; +import org.geysermc.geyser.translator.entity.EntityMetadataTranslator; import java.util.List; import java.util.Locale; @@ -78,7 +80,7 @@ public record EntityDefinition(EntityFactory factory, Entit return; } - translator.translateFunction().accept(entity, metadata); + translator.translate(entity, metadata); } @Setter diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java index fb21e68ff..c8f413e63 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java +++ b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java @@ -34,22 +34,23 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.factory.BaseEntityFactory; import org.geysermc.geyser.entity.factory.ExperienceOrbEntityFactory; import org.geysermc.geyser.entity.factory.PaintingEntityFactory; -import org.geysermc.geyser.entity.living.*; -import org.geysermc.geyser.entity.living.animal.*; -import org.geysermc.geyser.entity.living.animal.horse.*; -import org.geysermc.geyser.entity.living.animal.tameable.CatEntity; -import org.geysermc.geyser.entity.living.animal.tameable.ParrotEntity; -import org.geysermc.geyser.entity.living.animal.tameable.TameableEntity; -import org.geysermc.geyser.entity.living.animal.tameable.WolfEntity; -import org.geysermc.geyser.entity.living.merchant.AbstractMerchantEntity; -import org.geysermc.geyser.entity.living.merchant.VillagerEntity; -import org.geysermc.geyser.entity.living.monster.*; -import org.geysermc.geyser.entity.living.monster.raid.PillagerEntity; -import org.geysermc.geyser.entity.living.monster.raid.RaidParticipantEntity; -import org.geysermc.geyser.entity.living.monster.raid.SpellcasterIllagerEntity; -import org.geysermc.geyser.entity.living.monster.raid.VindicatorEntity; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.entity.type.*; +import org.geysermc.geyser.entity.type.living.*; +import org.geysermc.geyser.entity.type.living.animal.*; +import org.geysermc.geyser.entity.type.living.animal.horse.*; +import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.ParrotEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.TameableEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity; +import org.geysermc.geyser.entity.type.living.merchant.AbstractMerchantEntity; +import org.geysermc.geyser.entity.type.living.merchant.VillagerEntity; +import org.geysermc.geyser.entity.type.living.monster.*; +import org.geysermc.geyser.entity.type.living.monster.raid.PillagerEntity; +import org.geysermc.geyser.entity.type.living.monster.raid.RaidParticipantEntity; +import org.geysermc.geyser.entity.type.living.monster.raid.SpellcasterIllagerEntity; +import org.geysermc.geyser.entity.type.living.monster.raid.VindicatorEntity; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.registry.Registries; public final class EntityDefinitions { diff --git a/core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java b/core/src/main/java/org/geysermc/geyser/entity/InteractiveTagManager.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java rename to core/src/main/java/org/geysermc/geyser/entity/InteractiveTagManager.java index 026564939..b51f83f2c 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java +++ b/core/src/main/java/org/geysermc/geyser/entity/InteractiveTagManager.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.entity; import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import lombok.Getter; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.MobEntity; -import org.geysermc.geyser.entity.living.animal.AnimalEntity; -import org.geysermc.geyser.entity.living.animal.horse.HorseEntity; -import org.geysermc.geyser.entity.living.animal.tameable.CatEntity; -import org.geysermc.geyser.entity.living.animal.tameable.WolfEntity; -import org.geysermc.geyser.entity.living.merchant.VillagerEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.MobEntity; +import org.geysermc.geyser.entity.type.living.animal.AnimalEntity; +import org.geysermc.geyser.entity.type.living.animal.horse.HorseEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity; +import org.geysermc.geyser.entity.type.living.merchant.VillagerEntity; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.EnumSet; diff --git a/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java index 651064c42..dff1617f9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java +++ b/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java @@ -26,9 +26,9 @@ package org.geysermc.geyser.entity.factory; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java index 38d27607e..774166d44 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java +++ b/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java @@ -25,7 +25,7 @@ package org.geysermc.geyser.entity.factory; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; public interface EntityFactory { } diff --git a/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java index 74a4c530b..40a93c08b 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java +++ b/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java @@ -26,8 +26,8 @@ package org.geysermc.geyser.entity.factory; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.ExpOrbEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.ExpOrbEntity; +import org.geysermc.geyser.session.GeyserSession; @FunctionalInterface public interface ExperienceOrbEntityFactory extends EntityFactory { diff --git a/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java index 425defe61..2990b0ac5 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java +++ b/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java @@ -26,9 +26,9 @@ package org.geysermc.geyser.entity.factory; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.PaintingEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.PaintingType; +import org.geysermc.geyser.entity.type.PaintingEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.PaintingType; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/AbstractArrowEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/AbstractArrowEntity.java index 912d4b8a1..b80db2570 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/AbstractArrowEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java index b200d8f48..6063c81f9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata; @@ -31,8 +31,9 @@ import com.github.steveice10.mc.protocol.data.game.level.particle.Particle; 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.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.EffectUtils; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.registry.Registries; import java.util.UUID; @@ -64,7 +65,7 @@ public class AreaEffectCloudEntity extends Entity { public void setParticle(EntityMetadata entityMetadata) { Particle particle = entityMetadata.getValue(); - int particleId = EffectUtils.getParticleId(session, particle.getType()); + int particleId = Registries.PARTICLES.map(particle.getType(), mapping -> mapping.getParticleId(this.session)).orElse(-1); if (particleId != -1) { dirtyMetadata.put(EntityData.AREA_EFFECT_CLOUD_PARTICLE_ID, particleId); } diff --git a/core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java index 24d3b5bb2..ac1b3fcbd 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -32,7 +32,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.packet.AnimatePacket; import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/CommandBlockMinecartEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/CommandBlockMinecartEntity.java index e65952c02..1764c721e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/CommandBlockMinecartEntity.java @@ -23,11 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/DefaultBlockMinecartEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/DefaultBlockMinecartEntity.java index 50851eac6..ec00c30be 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/DefaultBlockMinecartEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/EnderCrystalEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/EnderCrystalEntity.java index 203f42033..aa907b7c6 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/EnderCrystalEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; @@ -31,7 +31,8 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/Entity.java b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/Entity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/Entity.java index 703ca212f..3b01c428f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/Entity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose; @@ -43,9 +43,11 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.entity.GeyserDirtyMetadata; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.util.MathUtils; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ExpOrbEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ExpOrbEntity.java index 830d5e368..25135d0b5 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ExpOrbEntity.java @@ -23,11 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.session.GeyserSession; public class ExpOrbEntity extends Entity { diff --git a/core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/FallingBlockEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/FallingBlockEntity.java index 25d19c876..346861f96 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/FallingBlockEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; 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.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java index f1bcb9a40..075178b55 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; @@ -36,10 +36,11 @@ import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.nbt.NbtType; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.packet.SetEntityMotionPacket; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.FireworkColor; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.FireworkColor; +import org.geysermc.geyser.util.MathUtils; import org.geysermc.floodgate.util.DeviceOs; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/FishingHookEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/FishingHookEntity.java index b5dde3c6e..b5774bd78 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/FishingHookEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; @@ -31,14 +31,15 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket; import lombok.Getter; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.BlockPositionIterator; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.level.block.BlockPositionIterator; +import org.geysermc.geyser.util.BlockUtils; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; diff --git a/core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/FurnaceMinecartEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/FurnaceMinecartEntity.java index f4eac3457..ab34cb751 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/FurnaceMinecartEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; 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 org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ItemEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ItemEntity.java index bacbce098..dd98f9aba 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ItemEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; @@ -34,9 +34,10 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.AddItemEntityPacket; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java index e4026570e..b8688abc4 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; @@ -39,8 +39,9 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket; import com.nukkitx.protocol.bedrock.v465.Bedrock_v465; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ItemedFireballEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ItemedFireballEntity.java index 8775c3282..49548ec2a 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ItemedFireballEntity.java @@ -23,10 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/LeashKnotEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/LeashKnotEntity.java index 1634552b8..63e964a55 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/LeashKnotEntity.java @@ -23,10 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/LightningEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/LightningEntity.java index 6de3c3eb3..1f5af0492 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/LightningEntity.java @@ -23,11 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; diff --git a/core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java index 16d5c316c..678741424 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; @@ -45,11 +45,12 @@ import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; +import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.AttributeUtils; -import org.geysermc.geyser.utils.ChunkUtils; +import org.geysermc.geyser.util.AttributeUtils; +import org.geysermc.geyser.util.ChunkUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/MinecartEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/MinecartEntity.java index 66f2f3d67..ffb5e4018 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/MinecartEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java index d5886f445..e97bb7090 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java @@ -23,12 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.AddPaintingPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.PaintingType; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.PaintingType; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/SpawnerMinecartEntity.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/SpawnerMinecartEntity.java index 4ee6c8bbc..2cd4cf3f6 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/SpawnerMinecartEntity.java @@ -23,12 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/TNTEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/TNTEntity.java index e4e67ff83..e7edd32d5 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/TNTEntity.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; -import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEntity.java index f68f4c760..67aa09794 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.nukkitx.math.vector.Vector3f; @@ -31,8 +31,9 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import com.nukkitx.protocol.bedrock.packet.MoveEntityDeltaPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java index e54d337b6..7abffd0bf 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java @@ -23,11 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java index 497e85914..c4cd5d54a 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; @@ -33,8 +33,9 @@ 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.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.Potion; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.item.Potion; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.EnumSet; diff --git a/core/src/main/java/org/geysermc/geyser/entity/Tickable.java b/core/src/main/java/org/geysermc/geyser/entity/type/Tickable.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/Tickable.java rename to core/src/main/java/org/geysermc/geyser/entity/type/Tickable.java index 1634ea87d..696f9008f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/Tickable.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/Tickable.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; /** * Implemented onto anything that should have code ran every Minecraft tick - 50 milliseconds. diff --git a/core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/TippedArrowEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/TippedArrowEntity.java index 330de942b..a60c0ab33 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/TippedArrowEntity.java @@ -23,13 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.TippedArrowPotion; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.item.TippedArrowPotion; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/TridentEntity.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/TridentEntity.java index e6dc2f252..65591fb50 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/TridentEntity.java @@ -23,10 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/WitherSkullEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/WitherSkullEntity.java index c314159b7..fbed041fe 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/WitherSkullEntity.java @@ -23,11 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.entity.type; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.EntityDefinition; +import org.geysermc.geyser.entity.EntityDefinitions; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/AbstractFishEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/AbstractFishEntity.java index c92ccbb9f..8fedce1e7 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/AbstractFishEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java index 9ce8a080c..b250f3e8e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/AmbientEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/AmbientEntity.java index 89f2e7e16..693a0cd46 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/AmbientEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java index 99e570aa8..fb459bf54 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Rotation; @@ -37,8 +37,8 @@ import lombok.Getter; import net.kyori.adventure.text.Component; import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/BatEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/BatEntity.java index 1fe7e758e..0a72a431e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/BatEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/CreatureEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/CreatureEntity.java index e42795371..b5e7557da 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/CreatureEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/FlyingEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/FlyingEntity.java index 508ab98bc..91f839bc3 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/FlyingEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/GlowSquidEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/GlowSquidEntity.java index ca6a1c7b2..b5950b7bc 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/GlowSquidEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/GolemEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/GolemEntity.java index 5b0a99efc..eb94e1406 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/GolemEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java index 69bfafa9a..f86392ed3 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/MagmaCubeEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/MagmaCubeEntity.java index c926eff70..03cf9f3dc 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/MagmaCubeEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/MobEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/MobEntity.java index bf7aae272..e82b813d7 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/MobEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; @@ -31,8 +31,8 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import lombok.Getter; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/SlimeEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/SlimeEntity.java index 17c1471d4..100ed764d 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/SlimeEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/SnowGolemEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/SnowGolemEntity.java index 6bc74de65..1d8375529 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/SnowGolemEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/SquidEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/SquidEntity.java index 0802b30ed..b0e2fcb9e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/SquidEntity.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.MoveEntityDeltaPacket; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.Tickable; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.type.Tickable; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/WaterEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/WaterEntity.java index 1ace4fe22..acacd1f52 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/WaterEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living; +package org.geysermc.geyser.entity.type.living; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AnimalEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AnimalEntity.java index b61dbf0d4..c7c15b288 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AnimalEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.AgeableEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.AgeableEntity; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java index 568d7a03a..4dfa5fa8d 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -31,7 +31,7 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/BeeEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/BeeEntity.java index 406213a7c..7f9ec4255 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/BeeEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -33,7 +33,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/ChickenEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/ChickenEntity.java index a28be7611..506714dbc 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/ChickenEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FoxEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FoxEntity.java index e550a955d..127a70a0f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FoxEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -31,7 +31,7 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/GoatEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/GoatEntity.java index 11a46315a..708a95134 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/GoatEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.nukkitx.math.vector.Vector3f; import lombok.Getter; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/HoglinEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/HoglinEntity.java index 06c408486..ed0feed97 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/HoglinEntity.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; 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.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.util.DimensionUtils; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/MooshroomEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/MooshroomEntity.java index cbad36252..15473c8ac 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/MooshroomEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/OcelotEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/OcelotEntity.java index f473f1d15..5244e3538 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/OcelotEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java index c41ffb3cf..7548ccef1 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -33,7 +33,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java index 03553b08c..0be4c78f1 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PolarBearEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PolarBearEntity.java index 9ff1b1918..727804dbc 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PolarBearEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PufferFishEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PufferFishEntity.java index 5916c8b62..66853babf 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PufferFishEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.AbstractFishEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.AbstractFishEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java index 9228542f4..a1d80ac72 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -31,7 +31,7 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/SheepEntity.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/SheepEntity.java index 9a8f8db9b..757c5b574 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/SheepEntity.java @@ -23,15 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; -import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java index d18d7acc1..d684fba06 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; 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.EntityFlag; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TropicalFishEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TropicalFishEntity.java index 98555425f..b883c91a9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TropicalFishEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.google.common.collect.ImmutableList; @@ -31,8 +31,8 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import it.unimi.dsi.fastutil.ints.IntList; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.AbstractFishEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.AbstractFishEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.List; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TurtleEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TurtleEntity.java index 06ef8a0ab..e892d7d5e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TurtleEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal; +package org.geysermc.geyser.entity.type.living.animal; 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.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java index 92f6f9687..7d0a3cf9a 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.horse; +package org.geysermc.geyser.entity.type.living.animal.horse; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.google.common.collect.ImmutableSet; @@ -36,8 +36,8 @@ import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.entity.living.animal.AnimalEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.animal.AnimalEntity; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.Set; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/ChestedHorseEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/ChestedHorseEntity.java index cf524cb38..ccf30dbc8 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/ChestedHorseEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.horse; +package org.geysermc.geyser.entity.type.living.animal.horse; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/HorseEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/HorseEntity.java index 25c323163..31b5b7890 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/HorseEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.horse; +package org.geysermc.geyser.entity.type.living.animal.horse; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/LlamaEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/LlamaEntity.java index 5934215b6..c18778c81 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/LlamaEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.horse; +package org.geysermc.geyser.entity.type.living.animal.horse; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; @@ -31,7 +31,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.MobArmorEquipmentPacket; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/TraderLlamaEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/TraderLlamaEntity.java index 1faed9e49..770d30a05 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/TraderLlamaEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.horse; +package org.geysermc.geyser.entity.type.living.animal.horse; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/CatEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/CatEntity.java index a2604e931..5538621d9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/CatEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.tameable; +package org.geysermc.geyser.entity.type.living.animal.tameable; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; @@ -32,7 +32,7 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/ParrotEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/ParrotEntity.java index b902ee1af..05f0a6ad5 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/ParrotEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.tameable; +package org.geysermc.geyser.entity.type.living.animal.tameable; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/TameableEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/TameableEntity.java index e08bdef9e..d12839e92 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/TameableEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.tameable; +package org.geysermc.geyser.entity.type.living.animal.tameable; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; @@ -31,10 +31,10 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import lombok.Getter; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.animal.AnimalEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.animal.AnimalEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/WolfEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/WolfEntity.java index 7a89b1153..13bb8e17d 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/WolfEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.animal.tameable; +package org.geysermc.geyser.entity.type.living.animal.tameable; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -32,7 +32,7 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.Set; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/AbstractMerchantEntity.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/AbstractMerchantEntity.java index 70bed1ec2..7981c9b23 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/AbstractMerchantEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.merchant; +package org.geysermc.geyser.entity.type.living.merchant; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.AgeableEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.AgeableEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/VillagerEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/VillagerEntity.java index 95a796e04..012fb05f2 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/VillagerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.merchant; +package org.geysermc.geyser.entity.type.living.merchant; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; @@ -37,7 +37,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import lombok.Getter; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.BlockRegistries; import java.util.Optional; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/AbstractSkeletonEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/AbstractSkeletonEntity.java index 993867ca9..ae13cfeae 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/AbstractSkeletonEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BasePiglinEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BasePiglinEntity.java index 664948bcd..2f315368f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BasePiglinEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.DimensionUtils; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BlazeEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BlazeEntity.java index 963cfb508..2303f8091 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BlazeEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreeperEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreeperEntity.java index 760cfb58e..f1e0b6a65 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreeperEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ElderGuardianEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ElderGuardianEntity.java index f2cb030ed..9c237f117 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ElderGuardianEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java index 379a166e9..f49b51e6c 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -34,10 +34,10 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.*; import lombok.Data; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.Tickable; -import org.geysermc.geyser.entity.living.MobEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.entity.type.Tickable; +import org.geysermc.geyser.entity.type.living.MobEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.DimensionUtils; import java.util.Random; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonPartEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonPartEntity.java index 088b7d721..7cd4bb6cf 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonPartEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class EnderDragonPartEntity extends Entity { diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EndermanEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EndermanEntity.java index b007c1ced..469f48521 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EndermanEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; @@ -33,7 +33,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.LevelSoundEvent2Packet; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GhastEntity.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GhastEntity.java index ccb320311..845a281d9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GhastEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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 org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.FlyingEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.FlyingEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GiantEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GiantEntity.java index 7f99d4de0..6dd27cc39 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GiantEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GuardianEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GuardianEntity.java index cbfeab8f2..0190f3c60 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/GuardianEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/MonsterEntity.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/MonsterEntity.java index e4b811b20..fad45f982 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/MonsterEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.CreatureEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.CreatureEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PhantomEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PhantomEntity.java index ba1975aed..68f3e7d23 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PhantomEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.FlyingEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.FlyingEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PiglinEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PiglinEntity.java index 1d1aa5652..b98d6eabc 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/PiglinEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ShulkerEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ShulkerEntity.java index 047b272c2..e60f81d2f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ShulkerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; @@ -32,8 +32,8 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.GolemEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.GolemEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SkeletonEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SkeletonEntity.java index ce1ecb8be..b1f6939aa 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SkeletonEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SpiderEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SpiderEntity.java index 9a51057d4..4f7b02d73 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/SpiderEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/VexEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/VexEntity.java index ddd31c655..938b18022 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/VexEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/WitherEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/WitherEntity.java index ea889d573..17da0a611 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/WitherEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZoglinEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZoglinEntity.java index cc5e21898..f0fe101da 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZoglinEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieEntity.java index b52c888da..9e3301b48 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieEntity.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieVillagerEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieVillagerEntity.java index 38472e03c..54a5c4506 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombieVillagerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.VillagerData; @@ -32,8 +32,8 @@ 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.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.merchant.VillagerEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.merchant.VillagerEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombifiedPiglinEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombifiedPiglinEntity.java index 8b25467f7..2604ce12e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/ZombifiedPiglinEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster; +package org.geysermc.geyser.entity.type.living.monster; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/AbstractIllagerEntity.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/AbstractIllagerEntity.java index 514ee276a..15ac1a0d9 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/AbstractIllagerEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster.raid; +package org.geysermc.geyser.entity.type.living.monster.raid; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/PillagerEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/PillagerEntity.java index 6b4f97151..477d9fef7 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/PillagerEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster.raid; +package org.geysermc.geyser.entity.type.living.monster.raid; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/RaidParticipantEntity.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/RaidParticipantEntity.java index 4e2fb2597..bd0f3ac5d 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/RaidParticipantEntity.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster.raid; +package org.geysermc.geyser.entity.type.living.monster.raid; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.living.monster.MonsterEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.living.monster.MonsterEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/SpellcasterIllagerEntity.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/SpellcasterIllagerEntity.java index 56099085f..7c2a05de1 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/SpellcasterIllagerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster.raid; +package org.geysermc.geyser.entity.type.living.monster.raid; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; @@ -31,7 +31,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/VindicatorEntity.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/VindicatorEntity.java index 49028dc23..a3b85dc73 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/raid/VindicatorEntity.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.living.monster.raid; +package org.geysermc.geyser.entity.type.living.monster.raid; import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java index 93b033118..8737ef847 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.player; +package org.geysermc.geyser.entity.type.player; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; @@ -47,13 +47,13 @@ import com.nukkitx.protocol.bedrock.packet.*; import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.entity.living.animal.tameable.ParrotEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.ParrotEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.scoreboard.Objective; import org.geysermc.geyser.scoreboard.Score; import org.geysermc.geyser.scoreboard.Team; diff --git a/core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java index ea0ec9cd3..c297bdb18 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.player; +package org.geysermc.geyser.entity.type.player; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute; @@ -39,8 +39,8 @@ import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import lombok.Getter; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.AttributeUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.AttributeUtils; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java rename to core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java index d6054d528..0afb3e8b5 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity.player; +package org.geysermc.geyser.entity.type.player; import com.github.steveice10.mc.auth.data.GameProfile; import com.nukkitx.math.vector.Vector3f; @@ -34,7 +34,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.AddPlayerPacket; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; /** * A wrapper to handle skulls more effectively - skulls have to be treated as entities since there are no diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java b/core/src/main/java/org/geysermc/geyser/inventory/BedrockContainerSlot.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java rename to core/src/main/java/org/geysermc/geyser/inventory/BedrockContainerSlot.java index 07ca32d61..0179bb277 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/BedrockContainerSlot.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory; +package org.geysermc.geyser.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import lombok.Value; diff --git a/core/src/main/java/org/geysermc/geyser/inventory/Container.java b/core/src/main/java/org/geysermc/geyser/inventory/Container.java index 48241a0e5..464d683fa 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/Container.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/Container.java @@ -28,8 +28,8 @@ package org.geysermc.geyser.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import lombok.Getter; import lombok.NonNull; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; /** * Combination of {@link Inventory} and {@link PlayerInventory} diff --git a/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java b/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java index 06cb88935..fc226f621 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java @@ -27,13 +27,14 @@ package org.geysermc.geyser.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.Generic3X3InventoryTranslator; public class Generic3X3Container extends Container { /** * Whether we need to set the container type as {@link com.nukkitx.protocol.bedrock.data.inventory.ContainerType#DROPPER}. * - * Used at {@link org.geysermc.geyser.network.translators.inventory.translators.Generic3X3InventoryTranslator#openInventory(GeyserSession, Inventory)} + * Used at {@link Generic3X3InventoryTranslator#openInventory(GeyserSession, Inventory)} */ @Getter private boolean isDropper = false; diff --git a/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java b/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java index 5af40eb21..8ecb3fe8d 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.inventory; import com.nukkitx.protocol.bedrock.data.inventory.EnchantData; import com.nukkitx.protocol.bedrock.data.inventory.EnchantOptionData; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.Arrays; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java b/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java index 82c6d89cc..a75631db0 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java @@ -29,8 +29,8 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import lombok.Data; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; import org.geysermc.geyser.registry.type.ItemMapping; import javax.annotation.Nonnull; diff --git a/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java index 98e101ea7..6eaaf84a2 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java @@ -34,7 +34,7 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java index 769a74028..916fa775a 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java @@ -29,7 +29,7 @@ import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; @Getter @Setter diff --git a/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java b/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java index 8bc3d9c2d..36114ccba 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java @@ -29,7 +29,7 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class PlayerInventory extends Inventory { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java b/core/src/main/java/org/geysermc/geyser/inventory/SlotType.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java rename to core/src/main/java/org/geysermc/geyser/inventory/SlotType.java index 38cca8397..17863ba66 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/SlotType.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory; +package org.geysermc.geyser.inventory; public enum SlotType { NORMAL, diff --git a/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java index 576823118..3dc35f5df 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java @@ -29,7 +29,7 @@ import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class StonecutterContainer extends Container { /** diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java b/core/src/main/java/org/geysermc/geyser/inventory/click/Click.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java rename to core/src/main/java/org/geysermc/geyser/inventory/click/Click.java index b194c9acf..187a98842 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/click/Click.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.click; +package org.geysermc.geyser.inventory.click; import com.github.steveice10.mc.protocol.data.game.inventory.ClickItemAction; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java b/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java rename to core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java index 23a3a314d..c239cc778 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.click; +package org.geysermc.geyser.inventory.click; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType; @@ -35,12 +35,12 @@ import it.unimi.dsi.fastutil.ints.IntSet; import lombok.Value; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.translators.CraftingInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.PlayerInventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.translator.inventory.CraftingInventoryTranslator; +import org.geysermc.geyser.translator.inventory.PlayerInventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java b/core/src/main/java/org/geysermc/geyser/inventory/holder/BlockInventoryHolder.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java rename to core/src/main/java/org/geysermc/geyser/inventory/holder/BlockInventoryHolder.java index 63b1747cf..8dba5a69d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/holder/BlockInventoryHolder.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.holder; +package org.geysermc.geyser.inventory.holder; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.google.common.collect.ImmutableSet; @@ -36,10 +36,10 @@ import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket; import org.geysermc.geyser.inventory.Container; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.util.BlockUtils; import java.util.Collections; import java.util.HashSet; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java b/core/src/main/java/org/geysermc/geyser/inventory/holder/InventoryHolder.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java rename to core/src/main/java/org/geysermc/geyser/inventory/holder/InventoryHolder.java index 810bab350..845e645e3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/holder/InventoryHolder.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.holder; +package org.geysermc.geyser.inventory.holder; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; public abstract class InventoryHolder { public abstract void prepareInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java b/core/src/main/java/org/geysermc/geyser/inventory/item/Enchantment.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java rename to core/src/main/java/org/geysermc/geyser/inventory/item/Enchantment.java index 5d05632c3..4abc7525e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/item/Enchantment.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.inventory.item; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java b/core/src/main/java/org/geysermc/geyser/inventory/item/Potion.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java rename to core/src/main/java/org/geysermc/geyser/inventory/item/Potion.java index dea1e9d21..1efb77ab0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/item/Potion.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.inventory.item; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java b/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java rename to core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java index 14ca7758f..f66c34e01 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.inventory.item; import lombok.Getter; import lombok.experimental.Accessors; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java b/core/src/main/java/org/geysermc/geyser/inventory/item/TippedArrowPotion.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java rename to core/src/main/java/org/geysermc/geyser/inventory/item/TippedArrowPotion.java index ad6850717..91d0f526f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/item/TippedArrowPotion.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.inventory.item; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/AnvilInventoryUpdater.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/AnvilInventoryUpdater.java index acb5f0941..f95633768 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/AnvilInventoryUpdater.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket; @@ -40,13 +40,13 @@ import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.inventory.AnvilContainer; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.inventory.item.Enchantment.JavaEnchantment; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.EnchantmentData; -import org.geysermc.geyser.utils.ItemUtils; +import org.geysermc.geyser.util.ItemUtils; import java.util.Objects; import java.util.Set; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/ChestInventoryUpdater.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/ChestInventoryUpdater.java index a3e5bb201..65147abb6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/ChestInventoryUpdater.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import lombok.AllArgsConstructor; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.util.ArrayList; import java.util.List; @@ -41,7 +41,7 @@ import java.util.function.IntFunction; @AllArgsConstructor public class ChestInventoryUpdater extends InventoryUpdater { - private static final IntFunction UNUSUABLE_SPACE_BLOCK = InventoryUtils.createUnusableSpaceBlock(LanguageUtils.getLocaleStringLog("geyser.inventory.unusable_item.slot")); + private static final IntFunction UNUSUABLE_SPACE_BLOCK = InventoryUtils.createUnusableSpaceBlock(GeyserLocale.getLocaleStringLog("geyser.inventory.unusable_item.slot")); private final int paddedSize; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/ContainerInventoryUpdater.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/ContainerInventoryUpdater.java index eb0b8afaa..dd1e810ca 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/ContainerInventoryUpdater.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/HorseInventoryUpdater.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/HorseInventoryUpdater.java index 115970b9b..10a556c81 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/HorseInventoryUpdater.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/InventoryUpdater.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/InventoryUpdater.java index 67ee607b9..6910aa447 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/InventoryUpdater.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.nukkitx.protocol.bedrock.data.inventory.ContainerId; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/inventory/updater/UIInventoryUpdater.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java rename to core/src/main/java/org/geysermc/geyser/inventory/updater/UIInventoryUpdater.java index aa24aae1e..79b6bffc0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/updater/UIInventoryUpdater.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.updater; +package org.geysermc.geyser.inventory.updater; import com.nukkitx.protocol.bedrock.data.inventory.ContainerId; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; public class UIInventoryUpdater extends InventoryUpdater { public static final UIInventoryUpdater INSTANCE = new UIInventoryUpdater(); diff --git a/core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java b/core/src/main/java/org/geysermc/geyser/level/BedrockMapIcon.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java rename to core/src/main/java/org/geysermc/geyser/level/BedrockMapIcon.java index cac901c0d..002753407 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java +++ b/core/src/main/java/org/geysermc/geyser/level/BedrockMapIcon.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; import com.github.steveice10.mc.protocol.data.game.level.map.MapIconType; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java b/core/src/main/java/org/geysermc/geyser/level/FireworkColor.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java rename to core/src/main/java/org/geysermc/geyser/level/FireworkColor.java index a95b727b6..cb8c57517 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java +++ b/core/src/main/java/org/geysermc/geyser/level/FireworkColor.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.util.HSVLike; diff --git a/core/src/main/java/org/geysermc/geyser/utils/GameRule.java b/core/src/main/java/org/geysermc/geyser/level/GameRule.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/GameRule.java rename to core/src/main/java/org/geysermc/geyser/level/GameRule.java index 7b95f192c..d11288c6f 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/GameRule.java +++ b/core/src/main/java/org/geysermc/geyser/level/GameRule.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java b/core/src/main/java/org/geysermc/geyser/level/GeyserAdvancement.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java rename to core/src/main/java/org/geysermc/geyser/level/GeyserAdvancement.java index 78b17af34..24bebf10a 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java +++ b/core/src/main/java/org/geysermc/geyser/level/GeyserAdvancement.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; import com.github.steveice10.mc.protocol.data.game.advancement.Advancement; import lombok.NonNull; -import org.geysermc.geyser.network.session.cache.AdvancementsCache; +import org.geysermc.geyser.session.cache.AdvancementsCache; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java b/core/src/main/java/org/geysermc/geyser/level/GeyserWorldManager.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java rename to core/src/main/java/org/geysermc/geyser/level/GeyserWorldManager.java index 41c3e0a55..d766c4b4c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java +++ b/core/src/main/java/org/geysermc/geyser/level/GeyserWorldManager.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world; +package org.geysermc.geyser.level; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.data.game.setting.Difficulty; @@ -32,11 +32,10 @@ import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtMapBuilder; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.ChunkCache; -import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.utils.GameRule; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.ChunkCache; +import org.geysermc.geyser.translator.inventory.LecternInventoryTranslator; +import org.geysermc.geyser.level.block.BlockStateValues; public class GeyserWorldManager extends WorldManager { diff --git a/core/src/main/java/org/geysermc/geyser/utils/MapColor.java b/core/src/main/java/org/geysermc/geyser/level/MapColor.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/MapColor.java rename to core/src/main/java/org/geysermc/geyser/level/MapColor.java index 9b0a75e56..1b2de18d1 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/MapColor.java +++ b/core/src/main/java/org/geysermc/geyser/level/MapColor.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; public enum MapColor { COLOR_0(-1, -1, -1), diff --git a/core/src/main/java/org/geysermc/geyser/utils/PaintingType.java b/core/src/main/java/org/geysermc/geyser/level/PaintingType.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/PaintingType.java rename to core/src/main/java/org/geysermc/geyser/level/PaintingType.java index aec9cb7c1..952828b17 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/PaintingType.java +++ b/core/src/main/java/org/geysermc/geyser/level/PaintingType.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java b/core/src/main/java/org/geysermc/geyser/level/WorldManager.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java rename to core/src/main/java/org/geysermc/geyser/level/WorldManager.java index a6fbe94d1..9aaf323c0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java +++ b/core/src/main/java/org/geysermc/geyser/level/WorldManager.java @@ -23,15 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world; +package org.geysermc.geyser.level; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.data.game.setting.Difficulty; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.GameRule; +import org.geysermc.geyser.session.GeyserSession; /** * Class that manages or retrieves various information diff --git a/core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java b/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java rename to core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java index 81ad49b66..0c7235f6c 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java +++ b/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level.block; import com.nukkitx.network.util.Preconditions; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java b/core/src/main/java/org/geysermc/geyser/level/block/BlockStateValues.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java rename to core/src/main/java/org/geysermc/geyser/level/block/BlockStateValues.java index 486ae745e..432ea1081 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java +++ b/core/src/main/java/org/geysermc/geyser/level/block/BlockStateValues.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block; +package org.geysermc.geyser.level.block; import com.fasterxml.jackson.databind.JsonNode; import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.PistonBlockEntityTranslator; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.BlockMapping; -import org.geysermc.geyser.utils.Direction; -import org.geysermc.geyser.utils.PistonBehavior; -import org.geysermc.geyser.utils.collections.FixedInt2ByteMap; -import org.geysermc.geyser.utils.collections.FixedInt2IntMap; -import org.geysermc.geyser.utils.collections.LecternHasBookMap; +import org.geysermc.geyser.level.physics.Direction; +import org.geysermc.geyser.level.physics.PistonBehavior; +import org.geysermc.geyser.util.collection.FixedInt2ByteMap; +import org.geysermc.geyser.util.collection.FixedInt2IntMap; +import org.geysermc.geyser.util.collection.LecternHasBookMap; /** * Used for block entities if the Java block state contains Bedrock block information. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java b/core/src/main/java/org/geysermc/geyser/level/block/DoubleChestValue.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java rename to core/src/main/java/org/geysermc/geyser/level/block/DoubleChestValue.java index b1e81b92c..bd4128abc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java +++ b/core/src/main/java/org/geysermc/geyser/level/block/DoubleChestValue.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block; +package org.geysermc.geyser.level.block; /** * This stores all values of double chests that are part of the Java block state. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java b/core/src/main/java/org/geysermc/geyser/level/chunk/BlockStorage.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/BlockStorage.java index 07f4dbcef..62d7df413 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/BlockStorage.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk; +package org.geysermc.geyser.level.chunk; import com.nukkitx.network.VarInts; import io.netty.buffer.ByteBuf; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import lombok.Getter; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArray; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArrayVersion; +import org.geysermc.geyser.level.chunk.bitarray.BitArray; +import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion; import java.util.function.IntConsumer; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java b/core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunk.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunk.java index 67257471d..365d196a3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunk.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk; +package org.geysermc.geyser.level.chunk; import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java b/core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunkSection.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunkSection.java index 7c0c18804..6daf13996 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunkSection.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk; +package org.geysermc.geyser.level.chunk; import com.nukkitx.network.util.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java b/core/src/main/java/org/geysermc/geyser/level/chunk/NibbleArray.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/NibbleArray.java index 970ae5f79..43dbd9fdc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/NibbleArray.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk; +package org.geysermc.geyser.level.chunk; import com.nukkitx.network.util.Preconditions; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArray.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArray.java index e44d92b20..cf69e697f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArray.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk.bitarray; +package org.geysermc.geyser.level.chunk.bitarray; import com.nukkitx.network.VarInts; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArrayVersion.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArrayVersion.java index c3cf94aaf..cd54ed73f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/BitArrayVersion.java @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk.bitarray; +package org.geysermc.geyser.level.chunk.bitarray; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.util.MathUtils; public enum BitArrayVersion { V16(16, 2, null), diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/PaddedBitArray.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/PaddedBitArray.java index 9b2c43ee5..3686ed4e0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/PaddedBitArray.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk.bitarray; +package org.geysermc.geyser.level.chunk.bitarray; import com.nukkitx.network.util.Preconditions; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.util.MathUtils; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/Pow2BitArray.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/Pow2BitArray.java index 5ad65b5aa..be5567e15 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/Pow2BitArray.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk.bitarray; +package org.geysermc.geyser.level.chunk.bitarray; import com.nukkitx.network.util.Preconditions; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.util.MathUtils; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/SingletonBitArray.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java rename to core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/SingletonBitArray.java index 13482307f..0c64ad76b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java +++ b/core/src/main/java/org/geysermc/geyser/level/chunk/bitarray/SingletonBitArray.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.chunk.bitarray; +package org.geysermc.geyser.level.chunk.bitarray; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/org/geysermc/geyser/utils/Axis.java b/core/src/main/java/org/geysermc/geyser/level/physics/Axis.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/Axis.java rename to core/src/main/java/org/geysermc/geyser/level/physics/Axis.java index 7465d6a4d..d9334368f 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/Axis.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/Axis.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level.physics; import com.nukkitx.math.vector.Vector3d; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java b/core/src/main/java/org/geysermc/geyser/level/physics/BoundingBox.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java rename to core/src/main/java/org/geysermc/geyser/level/physics/BoundingBox.java index c79c2799f..6600c5abc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/BoundingBox.java @@ -23,12 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision; +package org.geysermc.geyser.level.physics; import com.nukkitx.math.vector.Vector3d; import lombok.*; -import org.geysermc.geyser.utils.Axis; -import org.geysermc.geyser.utils.Direction; @Data @AllArgsConstructor diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java b/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java rename to core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java index 74678ae1d..5bd72182f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision; +package org.geysermc.geyser.level.physics; import com.nukkitx.math.vector.Vector3d; import com.nukkitx.math.vector.Vector3f; @@ -32,17 +32,16 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.PistonCache; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.collision.translators.ScaffoldingCollision; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.utils.Axis; -import org.geysermc.geyser.utils.BlockPositionIterator; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.PistonCache; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.translator.collision.ScaffoldingCollision; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.level.block.BlockPositionIterator; +import org.geysermc.geyser.util.BlockUtils; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/core/src/main/java/org/geysermc/geyser/utils/Direction.java b/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/Direction.java rename to core/src/main/java/org/geysermc/geyser/level/physics/Direction.java index c02d19196..fa3234460 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/Direction.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level.physics; import com.github.steveice10.mc.protocol.data.game.level.block.value.PistonValue; import com.nukkitx.math.vector.Vector3i; diff --git a/core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java b/core/src/main/java/org/geysermc/geyser/level/physics/PistonBehavior.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java rename to core/src/main/java/org/geysermc/geyser/level/physics/PistonBehavior.java index 74678479c..2a818d2d8 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/PistonBehavior.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.level.physics; import java.util.Locale; diff --git a/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java b/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java index fff852ad2..2cd866365 100644 --- a/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java +++ b/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java @@ -34,12 +34,12 @@ import io.netty.channel.DefaultEventLoopGroup; import io.netty.channel.socket.DatagramPacket; import io.netty.util.concurrent.DefaultThreadFactory; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.ping.GeyserPingInfo; +import org.geysermc.geyser.ping.GeyserPingInfo; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; import javax.annotation.Nonnull; import java.net.InetSocketAddress; @@ -82,14 +82,14 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler { } } - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.attempt_connect", inetSocketAddress)); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.attempt_connect", inetSocketAddress)); return true; } @Override public BedrockPong onQuery(InetSocketAddress inetSocketAddress) { if (geyser.getConfig().isDebugMode()) { - geyser.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.network.pinged", inetSocketAddress)); + geyser.getLogger().debug(GeyserLocale.getLocaleStringLog("geyser.network.pinged", inetSocketAddress)); } GeyserConfiguration config = geyser.getConfig(); diff --git a/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java index 83994f11c..0dceed7e9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java +++ b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java @@ -29,7 +29,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler; import com.nukkitx.protocol.bedrock.packet.*; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; /** * Bare bones implementation of BedrockPacketHandler suitable for extension. diff --git a/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java index e29cf5627..c8d1959ef 100644 --- a/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java +++ b/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java @@ -28,8 +28,8 @@ package org.geysermc.geyser.network; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.ping.GeyserPingInfo; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.ping.GeyserPingInfo; +import org.geysermc.geyser.translator.text.MessageTranslator; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java index 701f42219..a0800fb42 100644 --- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java +++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java @@ -32,13 +32,15 @@ import com.nukkitx.protocol.bedrock.data.ResourcePackType; import com.nukkitx.protocol.bedrock.packet.*; import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.AuthType; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslatorRegistry; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.pack.ResourcePack; +import org.geysermc.geyser.pack.ResourcePackManifest; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.*; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.util.*; import java.io.FileInputStream; import java.io.InputStream; @@ -50,7 +52,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { } private boolean translateAndDefault(BedrockPacket packet) { - return PacketTranslatorRegistry.BEDROCK_TRANSLATOR.translate(packet.getClass(), packet, session); + return Registries.BEDROCK_PACKET_TRANSLATORS.translate(packet.getClass(), packet, session); } @Override @@ -62,7 +64,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { public boolean handle(LoginPacket loginPacket) { if (geyser.isShuttingDown()) { // Don't allow new players in if we're no longer operating - session.disconnect(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.message")); + session.disconnect(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.kick.message")); return true; } @@ -71,12 +73,12 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { String supportedVersions = MinecraftProtocol.getAllSupportedVersions(); if (loginPacket.getProtocolVersion() > MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) { // Too early to determine session locale - session.getGeyser().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.server", supportedVersions)); - session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.outdated.server", supportedVersions)); + session.getGeyser().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.outdated.server", supportedVersions)); + session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.server", supportedVersions)); return true; } else if (loginPacket.getProtocolVersion() < MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) { - session.getGeyser().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.client", supportedVersions)); - session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.outdated.client", supportedVersions)); + session.getGeyser().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions)); + session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions)); return true; } } @@ -105,7 +107,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().getConfig().isForceResourcePacks()); session.sendUpstreamPacket(resourcePacksInfo); - LanguageUtils.loadGeyserLocale(session.getLocale()); + GeyserLocale.loadGeyserLocale(session.getLocale()); return true; } @@ -119,7 +121,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { // We must spawn the white world session.connect(); } - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.connect", session.getAuthData().getName())); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.connect", session.getAuthData().getName())); break; case SEND_PACKS: @@ -186,7 +188,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { GeyserConfiguration.IUserAuthenticationInfo info = geyser.getConfig().getUserAuths().get(bedrockUsername); if (info != null) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.stored_credentials", session.getAuthData().getName())); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.stored_credentials", session.getAuthData().getName())); session.setMicrosoftAccount(info.isMicrosoftAccount()); session.authenticate(info.getEmail(), info.getPassword()); return true; @@ -201,7 +203,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { if (session.isLoggingIn()) { SetTitlePacket titlePacket = new SetTitlePacket(); titlePacket.setType(SetTitlePacket.Type.ACTIONBAR); - titlePacket.setText(LanguageUtils.getPlayerLocaleString("geyser.auth.login.wait", session.getLocale())); + titlePacket.setText(GeyserLocale.getPlayerLocaleString("geyser.auth.login.wait", session.getLocale())); titlePacket.setFadeInTime(0); titlePacket.setFadeOutTime(1); titlePacket.setStayTime(2); diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/network/netty/ChannelWrapper.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java rename to core/src/main/java/org/geysermc/geyser/network/netty/ChannelWrapper.java index 985e690b1..ec23c4149 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/ChannelWrapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.buffer.ByteBufAllocator; import io.netty.channel.*; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java b/core/src/main/java/org/geysermc/geyser/network/netty/DefaultChannelPipelinePublic.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java rename to core/src/main/java/org/geysermc/geyser/network/netty/DefaultChannelPipelinePublic.java index a55d583d1..67bbf6427 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/DefaultChannelPipelinePublic.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.channel.Channel; import io.netty.channel.DefaultChannelPipeline; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserInjector.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java rename to core/src/main/java/org/geysermc/geyser/network/netty/GeyserInjector.java index 5e9f4f28f..b87c41ba6 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserInjector.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.channel.ChannelFuture; import lombok.Getter; -import org.geysermc.geyser.bootstrap.GeyserBootstrap; +import org.geysermc.geyser.GeyserBootstrap; import java.net.SocketAddress; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java b/core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWithRemoteAddress.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java rename to core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWithRemoteAddress.java index d6528f11b..96dcca77b 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWithRemoteAddress.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.channel.local.LocalChannel; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWrapper.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java rename to core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWrapper.java index edd3d4414..f80e85d70 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/LocalChannelWrapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.channel.DefaultChannelPipeline; import io.netty.channel.local.LocalChannel; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/network/netty/LocalServerChannelWrapper.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java rename to core/src/main/java/org/geysermc/geyser/network/netty/LocalServerChannelWrapper.java index 5a06c9727..7bb11e01b 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/LocalServerChannelWrapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import io.netty.channel.local.LocalChannel; import io.netty.channel.local.LocalServerChannel; diff --git a/core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java b/core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java rename to core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java index d29675835..781644056 100644 --- a/core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.connection; +package org.geysermc.geyser.network.netty; import com.github.steveice10.packetlib.BuiltinFlags; import com.github.steveice10.packetlib.packet.PacketProtocol; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java b/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java deleted file mode 100644 index 011360efd..000000000 --- a/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * 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.geyser.network.translators; - -import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTabListPacket; -import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket; -import com.github.steveice10.packetlib.packet.Packet; -import com.nukkitx.protocol.bedrock.BedrockPacket; -import io.netty.channel.EventLoop; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.geysermc.common.PlatformType; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; - -import java.util.IdentityHashMap; -import java.util.Map; - -public class PacketTranslatorRegistry { - private final Map, PacketTranslator> translators = new IdentityHashMap<>(); - - public static final PacketTranslatorRegistry JAVA_TRANSLATOR = new PacketTranslatorRegistry<>(); - public static final PacketTranslatorRegistry BEDROCK_TRANSLATOR = new PacketTranslatorRegistry<>(); - - private static final ObjectArrayList> IGNORED_PACKETS = new ObjectArrayList<>(); - - static { - for (Class clazz : FileUtils.getGeneratedClassesForAnnotation(Translator.class)) { - Class packet = clazz.getAnnotation(Translator.class).packet(); - - GeyserImpl.getInstance().getLogger().debug("Found annotated translator: " + clazz.getCanonicalName() + " : " + packet.getSimpleName()); - - try { - if (Packet.class.isAssignableFrom(packet)) { - Class targetPacket = (Class) packet; - PacketTranslator translator = (PacketTranslator) clazz.newInstance(); - - JAVA_TRANSLATOR.translators.put(targetPacket, translator); - } else if (BedrockPacket.class.isAssignableFrom(packet)) { - Class targetPacket = (Class) packet; - PacketTranslator translator = (PacketTranslator) clazz.newInstance(); - - BEDROCK_TRANSLATOR.translators.put(targetPacket, translator); - } else { - GeyserImpl.getInstance().getLogger().error("Class " + clazz.getCanonicalName() + " is annotated as a translator but has an invalid target packet."); - } - } catch (InstantiationException | IllegalAccessException e) { - GeyserImpl.getInstance().getLogger().error("Could not instantiate annotated translator " + clazz.getCanonicalName()); - } - } - - IGNORED_PACKETS.add(ClientboundLightUpdatePacket.class); // Light is handled on Bedrock for us - IGNORED_PACKETS.add(ClientboundTabListPacket.class); // Cant be implemented in Bedrock - } - - private PacketTranslatorRegistry() { - } - - public static void init() { - // no-op - } - - @SuppressWarnings("unchecked") - public

boolean translate(Class clazz, P packet, GeyserSession session) { - if (!session.getUpstream().isClosed() && !session.isClosed()) { - PacketTranslator

translator = (PacketTranslator

) translators.get(clazz); - if (translator != null) { - EventLoop eventLoop = session.getEventLoop(); - if (!translator.shouldExecuteInEventLoop() || eventLoop.inEventLoop()) { - translate0(session, translator, packet); - } else { - eventLoop.execute(() -> translate0(session, translator, packet)); - } - return true; - } else { - if ((GeyserImpl.getInstance().getPlatformType() != PlatformType.STANDALONE || !(packet instanceof BedrockPacket)) && !IGNORED_PACKETS.contains(clazz)) { - // Other debug logs already take care of Bedrock packets for us if on standalone - GeyserImpl.getInstance().getLogger().debug("Could not find packet for " + (packet.toString().length() > 25 ? packet.getClass().getSimpleName() : packet)); - } - } - } - return false; - } - - private

void translate0(GeyserSession session, PacketTranslator

translator, P packet) { - if (session.isClosed()) { - return; - } - - try { - translator.translate(session, packet); - } catch (Throwable ex) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.network.translator.packet.failed", packet.getClass().getSimpleName()), ex); - ex.printStackTrace(); - } - } -} diff --git a/core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java b/core/src/main/java/org/geysermc/geyser/pack/ResourcePack.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java rename to core/src/main/java/org/geysermc/geyser/pack/ResourcePack.java index cfa7c4051..1f69fbdbc 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java +++ b/core/src/main/java/org/geysermc/geyser/pack/ResourcePack.java @@ -23,9 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.pack; import org.geysermc.geyser.GeyserImpl; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.io.File; import java.util.HashMap; @@ -96,7 +98,7 @@ public class ResourcePack { } }); } catch (Exception e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.resource_pack.broken", file.getName())); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", file.getName())); e.printStackTrace(); } finally { if (stream != null) { diff --git a/core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java b/core/src/main/java/org/geysermc/geyser/pack/ResourcePackManifest.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java rename to core/src/main/java/org/geysermc/geyser/pack/ResourcePackManifest.java index c9563b5fc..1e79b330b 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java +++ b/core/src/main/java/org/geysermc/geyser/pack/ResourcePackManifest.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.pack; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java b/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java index 88671b66f..9d36b0274 100644 --- a/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java +++ b/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java @@ -28,7 +28,6 @@ package org.geysermc.geyser.ping; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.nukkitx.nbt.util.VarInts; -import org.geysermc.geyser.common.ping.GeyserPingInfo; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; diff --git a/core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java b/core/src/main/java/org/geysermc/geyser/ping/GeyserPingInfo.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java rename to core/src/main/java/org/geysermc/geyser/ping/GeyserPingInfo.java index 6a7f1f13c..ac3c61980 100644 --- a/core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java +++ b/core/src/main/java/org/geysermc/geyser/ping/GeyserPingInfo.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.ping; +package org.geysermc.geyser.ping; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java b/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java index 5a2eb04ae..d2ebbe4ac 100644 --- a/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java +++ b/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java @@ -25,8 +25,6 @@ package org.geysermc.geyser.ping; -import org.geysermc.geyser.common.ping.GeyserPingInfo; - import java.net.Inet4Address; import java.net.InetSocketAddress; diff --git a/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java index 390d3b2aa..acabef46f 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java +++ b/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java @@ -29,6 +29,8 @@ import org.geysermc.geyser.registry.loader.RegistryLoader; import javax.annotation.Nullable; import java.util.Map; +import java.util.Optional; +import java.util.function.Function; /** * An abstract registry holding a map of various registrations as defined by {@link M}. @@ -55,6 +57,23 @@ public abstract class AbstractMappedRegistry> extends return this.mappings.get(key); } + /** + * Returns & maps the value by the given key if present. + * + * @param key the key + * @param mapper the mapper + * @param the type + * @return the mapped value from the given key if present + */ + public Optional map(K key, Function mapper) { + V value = this.get(key); + if (value == null) { + return Optional.empty(); + } else { + return Optional.ofNullable(mapper.apply(value)); + } + } + /** * Returns the value registered by the given key or the default value * specified if null. diff --git a/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java b/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java index c80eb739b..870828f44 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java +++ b/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java @@ -33,7 +33,7 @@ import org.geysermc.geyser.registry.loader.RegistryLoaders; import org.geysermc.geyser.registry.populator.BlockRegistryPopulator; import org.geysermc.geyser.registry.type.BlockMapping; import org.geysermc.geyser.registry.type.BlockMappings; -import org.geysermc.geyser.utils.collections.Object2IntBiMap; +import org.geysermc.geyser.util.collection.Object2IntBiMap; /** * Holds all the block registries in Geyser. diff --git a/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java new file mode 100644 index 000000000..e74d15001 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/registry/PacketTranslatorRegistry.java @@ -0,0 +1,96 @@ +/* + * 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.geyser.registry; + +import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTabListPacket; +import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket; +import com.nukkitx.protocol.bedrock.BedrockPacket; +import io.netty.channel.EventLoop; +import org.geysermc.common.PlatformType; +import org.geysermc.geyser.GeyserImpl; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.registry.loader.RegistryLoaders; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.text.GeyserLocale; + +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Set; + +public class PacketTranslatorRegistry extends AbstractMappedRegistry, PacketTranslator, IdentityHashMap, PacketTranslator>> { + private static final Set> IGNORED_PACKETS = Collections.newSetFromMap(new IdentityHashMap<>()); + + static { + IGNORED_PACKETS.add(ClientboundLightUpdatePacket.class); // Light is handled on Bedrock for us + IGNORED_PACKETS.add(ClientboundTabListPacket.class); // Cant be implemented in Bedrock + } + + protected PacketTranslatorRegistry() { + super(null, RegistryLoaders.empty(IdentityHashMap::new)); + } + + @SuppressWarnings("unchecked") + public

boolean translate(Class clazz, P packet, GeyserSession session) { + if (session.getUpstream().isClosed() || session.isClosed()) { + return false; + } + + PacketTranslator

translator = (PacketTranslator

) this.mappings.get(clazz); + if (translator != null) { + EventLoop eventLoop = session.getEventLoop(); + if (!translator.shouldExecuteInEventLoop() || eventLoop.inEventLoop()) { + translate0(session, translator, packet); + } else { + eventLoop.execute(() -> translate0(session, translator, packet)); + } + return true; + } else { + if ((GeyserImpl.getInstance().getPlatformType() != PlatformType.STANDALONE || !(packet instanceof BedrockPacket)) && !IGNORED_PACKETS.contains(clazz)) { + // Other debug logs already take care of Bedrock packets for us if on standalone + GeyserImpl.getInstance().getLogger().debug("Could not find packet for " + (packet.toString().length() > 25 ? packet.getClass().getSimpleName() : packet)); + } + + return false; + } + } + + private

void translate0(GeyserSession session, PacketTranslator

translator, P packet) { + if (session.isClosed()) { + return; + } + + try { + translator.translate(session, packet); + } catch (Throwable ex) { + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.network.translator.packet.failed", packet.getClass().getSimpleName()), ex); + ex.printStackTrace(); + } + } + + public static PacketTranslatorRegistry create() { + return new PacketTranslatorRegistry<>(); + } +} diff --git a/core/src/main/java/org/geysermc/geyser/registry/Registries.java b/core/src/main/java/org/geysermc/geyser/registry/Registries.java index ef73e28e9..7473980cd 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/Registries.java +++ b/core/src/main/java/org/geysermc/geyser/registry/Registries.java @@ -31,7 +31,9 @@ import com.github.steveice10.mc.protocol.data.game.level.event.SoundEvent; import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleType; import com.github.steveice10.mc.protocol.data.game.recipe.Recipe; import com.github.steveice10.mc.protocol.data.game.recipe.RecipeType; +import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.nbt.NbtMap; +import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.data.inventory.CraftingData; import com.nukkitx.protocol.bedrock.data.inventory.PotionMixData; import it.unimi.dsi.fastutil.Pair; @@ -40,12 +42,13 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment; -import org.geysermc.geyser.network.translators.sound.SoundHandler; -import org.geysermc.geyser.network.translators.sound.SoundInteractionHandler; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator; -import org.geysermc.geyser.network.translators.world.event.LevelEventTransformer; +import org.geysermc.geyser.registry.populator.PacketRegistryPopulator; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.inventory.item.Enchantment.JavaEnchantment; +import org.geysermc.geyser.translator.sound.SoundTranslator; +import org.geysermc.geyser.translator.sound.SoundInteractionTranslator; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.translator.level.event.LevelEventTranslator; import org.geysermc.geyser.registry.loader.*; import org.geysermc.geyser.registry.populator.ItemRegistryPopulator; import org.geysermc.geyser.registry.populator.RecipeRegistryPopulator; @@ -68,6 +71,11 @@ public class Registries { */ public static final SimpleRegistry BEDROCK_ENTITY_IDENTIFIERS = SimpleRegistry.create("bedrock/entity_identifiers.dat", RegistryLoaders.NBT); + /** + * A registry containing all the Bedrock packet translators. + */ + public static final PacketTranslatorRegistry BEDROCK_PACKET_TRANSLATORS = PacketTranslatorRegistry.create(); + /** * A registry holding a CompoundTag of all the known biomes. */ @@ -81,12 +89,12 @@ public class Registries { /** * A mapped registry which stores a block entity identifier to its {@link BlockEntityTranslator}. */ - public static final SimpleMappedRegistry BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.geyser.network.translators.world.block.entity.BlockEntity", BlockEntityRegistryLoader::new); + public static final SimpleMappedRegistry BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.geyser.translator.level.block.entity.BlockEntity", BlockEntityRegistryLoader::new); /** * A mapped registry containing which holds block IDs to its {@link BlockCollision}. */ - public static final SimpleMappedRegistry COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.geyser.network.translators.collision.translators.Translator", "mappings/collision.json"), CollisionRegistryLoader::new); + public static final SimpleMappedRegistry COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.geyser.translator.collision.CollisionRemapper", "mappings/collision.json"), CollisionRegistryLoader::new); /** * A versioned registry which holds a {@link RecipeType} to a corresponding list of {@link CraftingData}. @@ -108,6 +116,11 @@ public class Registries { */ public static final SimpleMappedRegistry> JAVA_ENTITY_IDENTIFIERS = SimpleMappedRegistry.create(RegistryLoaders.empty(Object2ObjectOpenHashMap::new)); + /** + * A registry containing all the Java packet translators. + */ + public static final PacketTranslatorRegistry JAVA_PACKET_TRANSLATORS = PacketTranslatorRegistry.create(); + /** * A versioned registry which holds {@link ItemMappings} for each version. These item mappings contain * primarily Bedrock version-specific data. @@ -142,20 +155,21 @@ public class Registries { public static final SimpleMappedRegistry SOUNDS = SimpleMappedRegistry.create("mappings/sounds.json", SoundRegistryLoader::new); /** - * A mapped registry holding {@link SoundEvent}s to their corresponding {@link LevelEventTransformer}. + * A mapped registry holding {@link SoundEvent}s to their corresponding {@link LevelEventTranslator}. */ - public static final SimpleMappedRegistry SOUND_EVENTS = SimpleMappedRegistry.create("mappings/effects.json", SoundEventsRegistryLoader::new); + public static final SimpleMappedRegistry SOUND_EVENTS = SimpleMappedRegistry.create("mappings/effects.json", SoundEventsRegistryLoader::new); /** - * A mapped registry holding {@link SoundHandler}s to their corresponding {@link SoundInteractionHandler}. + * A mapped registry holding {@link SoundTranslator}s to their corresponding {@link SoundInteractionTranslator}. */ - public static final SimpleMappedRegistry> SOUND_HANDLERS = SimpleMappedRegistry.create("org.geysermc.geyser.network.translators.sound.SoundHandler", SoundHandlerRegistryLoader::new); + public static final SimpleMappedRegistry> SOUND_TRANSLATORS = SimpleMappedRegistry.create("org.geysermc.geyser.translator.sound.SoundTranslator", SoundTranslatorRegistryLoader::new); public static void init() { // no-op } static { + PacketRegistryPopulator.populate(); ItemRegistryPopulator.populate(); RecipeRegistryPopulator.populate(); diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java index 1f42d7fb0..d8314965f 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java @@ -26,7 +26,7 @@ package org.geysermc.geyser.registry.loader; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.lang.annotation.Annotation; import java.util.Map; @@ -45,7 +45,7 @@ import java.util.function.Function; * replaced with a simple Function.identity() if not desired. * *

- * See {@link BlockEntityRegistryLoader} and {@link SoundHandlerRegistryLoader} as a + * See {@link BlockEntityRegistryLoader} and {@link SoundTranslatorRegistryLoader} as a * good example of these registry loaders in use. * * @param the final result as transformed by the function diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java index 5af552469..f510b3592 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java index fd0f72a84..b18d6959d 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java @@ -28,10 +28,10 @@ package org.geysermc.geyser.registry.loader; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntity; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator; -import org.geysermc.geyser.network.translators.world.block.entity.EmptyBlockEntityTranslator; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.translator.level.block.entity.BlockEntity; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.EmptyBlockEntityTranslator; +import org.geysermc.geyser.util.FileUtils; import java.lang.reflect.InvocationTargetException; import java.util.Map; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java index bf3877ff6..1587a5420 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java @@ -33,14 +33,14 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import lombok.AllArgsConstructor; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.collision.translators.OtherCollision; -import org.geysermc.geyser.network.translators.collision.translators.SolidCollision; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.translator.collision.CollisionRemapper; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.translator.collision.OtherCollision; +import org.geysermc.geyser.translator.collision.SolidCollision; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.BlockMapping; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java index 1da42a68d..7da3a3b6c 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java @@ -27,7 +27,7 @@ package org.geysermc.geyser.registry.loader; import com.fasterxml.jackson.databind.JsonNode; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.InputStream; import java.util.Map; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/EnchantmentRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/EnchantmentRegistryLoader.java index 0cb2d4bbb..b3683a7dc 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/EnchantmentRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/EnchantmentRegistryLoader.java @@ -30,11 +30,11 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment; +import org.geysermc.geyser.inventory.item.Enchantment.JavaEnchantment; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.EnchantmentData; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.InputStream; import java.util.EnumMap; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/NbtRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/NbtRegistryLoader.java index 6e0abaa62..6134e8d98 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/NbtRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/NbtRegistryLoader.java @@ -28,7 +28,7 @@ package org.geysermc.geyser.registry.loader; import com.nukkitx.nbt.NBTInputStream; import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtUtils; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.InputStream; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java index 105cec9fa..1280ce297 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java @@ -29,7 +29,7 @@ import com.nukkitx.protocol.bedrock.data.inventory.PotionMixData; import org.geysermc.geyser.network.MinecraftProtocol; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.network.translators.item.Potion; +import org.geysermc.geyser.inventory.item.Potion; import java.util.ArrayList; import java.util.HashSet; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/SoundEventsRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/SoundEventsRegistryLoader.java index 3970a5fb5..1b0f93c6a 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/SoundEventsRegistryLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/SoundEventsRegistryLoader.java @@ -30,10 +30,10 @@ import com.github.steveice10.mc.protocol.data.game.level.event.SoundEvent; import com.nukkitx.protocol.bedrock.data.LevelEventType; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.world.event.LevelEventTransformer; -import org.geysermc.geyser.network.translators.world.event.PlaySoundEventTransformer; -import org.geysermc.geyser.network.translators.world.event.SoundEventEventTransformer; -import org.geysermc.geyser.network.translators.world.event.SoundLevelEventTransformer; +import org.geysermc.geyser.translator.level.event.LevelEventTranslator; +import org.geysermc.geyser.translator.level.event.PlaySoundEventTranslator; +import org.geysermc.geyser.translator.level.event.SoundEventEventTranslator; +import org.geysermc.geyser.translator.level.event.SoundLevelEventTranslator; import java.util.Iterator; import java.util.Map; @@ -41,34 +41,34 @@ import java.util.Map; /** * Loads sound effects from the given resource path. */ -public class SoundEventsRegistryLoader extends EffectRegistryLoader> { +public class SoundEventsRegistryLoader extends EffectRegistryLoader> { @Override - public Map load(String input) { + public Map load(String input) { this.loadFile(input); Iterator> effectsIterator = this.get(input).fields(); - Map soundEffects = new Object2ObjectOpenHashMap<>(); + Map soundEffects = new Object2ObjectOpenHashMap<>(); while (effectsIterator.hasNext()) { Map.Entry entry = effectsIterator.next(); JsonNode node = entry.getValue(); try { String type = node.get("type").asText(); SoundEvent javaEffect = null; - LevelEventTransformer transformer = null; + LevelEventTranslator transformer = null; switch (type) { case "soundLevel" -> { javaEffect = SoundEvent.valueOf(entry.getKey()); LevelEventType levelEventType = LevelEventType.valueOf(node.get("name").asText()); int data = node.has("data") ? node.get("data").intValue() : 0; - transformer = new SoundLevelEventTransformer(levelEventType, data); + transformer = new SoundLevelEventTranslator(levelEventType, data); } case "soundEvent" -> { javaEffect = SoundEvent.valueOf(entry.getKey()); com.nukkitx.protocol.bedrock.data.SoundEvent soundEvent = com.nukkitx.protocol.bedrock.data.SoundEvent.valueOf(node.get("name").asText()); String identifier = node.has("identifier") ? node.get("identifier").asText() : ""; int extraData = node.has("extraData") ? node.get("extraData").intValue() : -1; - transformer = new SoundEventEventTransformer(soundEvent, identifier, extraData); + transformer = new SoundEventEventTranslator(soundEvent, identifier, extraData); } case "playSound" -> { javaEffect = SoundEvent.valueOf(entry.getKey()); @@ -78,7 +78,7 @@ public class SoundEventsRegistryLoader extends EffectRegistryLoader> { - public SoundHandlerRegistryLoader() { - super(SoundHandler.class, Function.identity()); +public class SoundTranslatorRegistryLoader extends AnnotatedRegistryLoader> { + public SoundTranslatorRegistryLoader() { + super(SoundTranslator.class, Function.identity()); } } \ No newline at end of file diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java index d5c93c3cc..504fd5b8e 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java @@ -37,13 +37,13 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIntPair; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.BlockMapping; import org.geysermc.geyser.registry.type.BlockMappings; -import org.geysermc.geyser.utils.BlockUtils; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.PistonBehavior; +import org.geysermc.geyser.util.BlockUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.level.physics.PistonBehavior; import java.io.DataInputStream; import java.io.InputStream; diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java index 6e8649c37..52d55d2d3 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java @@ -40,11 +40,11 @@ import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.objects.*; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.item.StoredItemMappings; +import org.geysermc.geyser.inventory.item.StoredItemMappings; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.*; -import org.geysermc.geyser.utils.FileUtils; +import org.geysermc.geyser.util.FileUtils; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/PacketRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/PacketRegistryPopulator.java new file mode 100644 index 000000000..5024d26e7 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/PacketRegistryPopulator.java @@ -0,0 +1,63 @@ +/* + * 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.geyser.registry.populator; + +import com.github.steveice10.packetlib.packet.Packet; +import com.nukkitx.protocol.bedrock.BedrockPacket; +import org.geysermc.geyser.GeyserImpl; +import org.geysermc.geyser.registry.Registries; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.FileUtils; + +public class PacketRegistryPopulator { + + public static void populate() { + for (Class clazz : FileUtils.getGeneratedClassesForAnnotation(Translator.class)) { + Class packet = clazz.getAnnotation(Translator.class).packet(); + + GeyserImpl.getInstance().getLogger().debug("Found annotated translator: " + clazz.getCanonicalName() + " : " + packet.getSimpleName()); + + try { + if (Packet.class.isAssignableFrom(packet)) { + Class targetPacket = (Class) packet; + PacketTranslator translator = (PacketTranslator) clazz.newInstance(); + + Registries.JAVA_PACKET_TRANSLATORS.register(targetPacket, translator); + } else if (BedrockPacket.class.isAssignableFrom(packet)) { + Class targetPacket = (Class) packet; + PacketTranslator translator = (PacketTranslator) clazz.newInstance(); + + Registries.BEDROCK_PACKET_TRANSLATORS.register(targetPacket, translator); + } else { + GeyserImpl.getInstance().getLogger().error("Class " + clazz.getCanonicalName() + " is annotated as a translator but has an invalid target packet."); + } + } catch (InstantiationException | IllegalAccessException e) { + GeyserImpl.getInstance().getLogger().error("Could not instantiate annotated translator " + clazz.getCanonicalName()); + } + } + } +} diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java index bd124e28f..ecc3fbb29 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java @@ -40,19 +40,19 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; -import static org.geysermc.geyser.utils.InventoryUtils.LAST_RECIPE_NET_ID; +import static org.geysermc.geyser.util.InventoryUtils.LAST_RECIPE_NET_ID; /** * Populates the recipe registry. @@ -66,7 +66,7 @@ public class RecipeRegistryPopulator { try { items = GeyserImpl.JSON_MAPPER.readTree(stream); } catch (Exception e) { - throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.toolbox.fail.runtime_java"), e); + throw new AssertionError(GeyserLocale.getLocaleStringLog("geyser.toolbox.fail.runtime_java"), e); } int currentRecipeId = LAST_RECIPE_NET_ID; diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java index cad2d12f5..e65ebcfff 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java +++ b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java @@ -27,8 +27,8 @@ package org.geysermc.geyser.registry.type; import lombok.Builder; import lombok.Value; -import org.geysermc.geyser.utils.BlockUtils; -import org.geysermc.geyser.utils.PistonBehavior; +import org.geysermc.geyser.util.BlockUtils; +import org.geysermc.geyser.level.physics.PistonBehavior; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java b/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java index 0c0e7df1d..ce8b6abc5 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java +++ b/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java @@ -26,7 +26,7 @@ package org.geysermc.geyser.registry.type; import it.unimi.dsi.fastutil.ints.IntSet; -import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment; +import org.geysermc.geyser.inventory.item.Enchantment.JavaEnchantment; import java.util.Set; diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java index f0eb1747b..a246cdcf3 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java +++ b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java @@ -34,7 +34,7 @@ import it.unimi.dsi.fastutil.ints.IntList; import lombok.Builder; import lombok.Value; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.translators.item.StoredItemMappings; +import org.geysermc.geyser.inventory.item.StoredItemMappings; import javax.annotation.Nullable; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java index 17590d7fc..cd5ad17ce 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java +++ b/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java @@ -26,9 +26,18 @@ package org.geysermc.geyser.registry.type; import com.nukkitx.protocol.bedrock.data.LevelEventType; +import org.geysermc.geyser.session.GeyserSession; import javax.annotation.ParametersAreNullableByDefault; @ParametersAreNullableByDefault public record ParticleMapping(LevelEventType levelEventType, String identifier) { + + public int getParticleId(GeyserSession session) { + if (this.levelEventType == null) { + return -1; + } + + return session.getUpstream().getSession().getPacketCodec().getHelper().getLevelEventId(this.levelEventType) & ~0x4000; + } } \ No newline at end of file diff --git a/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java index 41b46aedf..3dc416c6c 100644 --- a/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java +++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java @@ -33,10 +33,10 @@ import com.nukkitx.protocol.bedrock.packet.SetScorePacket; import lombok.Getter; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import javax.annotation.Nullable; import java.util.*; @@ -125,7 +125,7 @@ public final class Scoreboard { public Team registerNewTeam(String teamName, String[] players) { Team team = teams.get(teamName); if (team != null) { - logger.info(LanguageUtils.getLocaleStringLog("geyser.network.translator.team.failed_overrides", teamName)); + logger.info(GeyserLocale.getLocaleStringLog("geyser.network.translator.team.failed_overrides", teamName)); return team; } diff --git a/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java b/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java index 9c732046c..2f817a918 100644 --- a/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java +++ b/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java @@ -29,9 +29,9 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldCache; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldCache; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; @@ -118,8 +118,8 @@ public final class ScoreboardUpdater extends Thread { FIRST_SCORE_PACKETS_PER_SECOND_THRESHOLD; geyser.getLogger().info( - LanguageUtils.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached.log", session.getName(), threshold, pps) + - LanguageUtils.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached", (millisBetweenUpdates / 1000.0)) + GeyserLocale.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached.log", session.getName(), threshold, pps) + + GeyserLocale.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached", (millisBetweenUpdates / 1000.0)) ); scoreboardSession.lastLog = currentTime; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java rename to core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 161ddb52e..cf5f5c6af 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session; +package org.geysermc.geyser.session; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.auth.exception.request.AuthPendingException; @@ -74,31 +74,35 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; import org.geysermc.common.PlatformType; +import org.geysermc.geyser.Constants; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandSender; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.common.connection.LocalSession; +import org.geysermc.geyser.entity.InteractiveTagManager; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.network.netty.LocalSession; import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.ItemFrameEntity; -import org.geysermc.geyser.entity.Tickable; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.ItemFrameEntity; +import org.geysermc.geyser.entity.type.Tickable; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.entity.player.SkullPlayerEntity; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.entity.type.player.SkullPlayerEntity; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.auth.AuthData; -import org.geysermc.geyser.network.session.auth.BedrockClientData; -import org.geysermc.geyser.network.session.cache.*; -import org.geysermc.geyser.network.translators.PacketTranslatorRegistry; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.collision.CollisionManager; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; +import org.geysermc.geyser.level.WorldManager; +import org.geysermc.geyser.session.auth.AuthData; +import org.geysermc.geyser.session.auth.BedrockClientData; +import org.geysermc.geyser.session.cache.*; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.text.MinecraftLocale; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.level.physics.CollisionManager; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.BlockMappings; import org.geysermc.geyser.registry.type.ItemMappings; import org.geysermc.geyser.skin.FloodgateSkinUploader; -import org.geysermc.geyser.utils.*; +import org.geysermc.geyser.util.*; import org.geysermc.cumulus.Form; import org.geysermc.cumulus.util.FormBuilder; import org.geysermc.floodgate.crypto.FloodgateCipher; @@ -222,7 +226,7 @@ public class GeyserSession implements CommandSender { /** * Stores a list of all lectern locations and their block entity tags. - * See {@link org.geysermc.geyser.network.translators.world.WorldManager#getLecternDataAt(GeyserSession, int, int, int, boolean)} + * See {@link WorldManager#getLecternDataAt(GeyserSession, int, int, int, boolean)} * for more information. */ private final Set lecternCache; @@ -503,7 +507,7 @@ public class GeyserSession implements CommandSender { bedrockServerSession.addDisconnectHandler(disconnectReason -> { InetAddress address = bedrockServerSession.getRealAddress().getAddress(); - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.disconnect", address, disconnectReason)); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.disconnect", address, disconnectReason)); disconnect(disconnectReason.name()); geyser.getSessionManager().removeSession(this); @@ -571,9 +575,9 @@ public class GeyserSession implements CommandSender { public void login() { if (this.remoteAuthType != AuthType.ONLINE) { if (this.remoteAuthType == AuthType.OFFLINE) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.offline")); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.login.offline")); } else { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.floodgate")); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.login.floodgate")); } authenticate(authData.getName()); } @@ -585,7 +589,7 @@ public class GeyserSession implements CommandSender { public void authenticate(String username, String password) { if (loggedIn) { - geyser.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", username)); + geyser.getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.auth.already_loggedin", username)); return; } @@ -609,7 +613,7 @@ public class GeyserSession implements CommandSender { GameProfile profile = authenticationService.getSelectedProfile(); if (profile == null) { // Java account is offline - disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode())); + disconnect(GeyserLocale.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode())); return null; } @@ -627,8 +631,8 @@ public class GeyserSession implements CommandSender { protocol = new MinecraftProtocol(validUsername); } } catch (InvalidCredentialsException | IllegalArgumentException e) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.invalid", username)); - disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode())); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.login.invalid", username)); + disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode())); } catch (RequestException ex) { disconnect(ex.getMessage()); } @@ -654,7 +658,7 @@ public class GeyserSession implements CommandSender { */ public void authenticateWithMicrosoftCode() { if (loggedIn) { - geyser.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", getAuthData().getName())); + geyser.getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.auth.already_loggedin", getAuthData().getName())); return; } @@ -700,7 +704,7 @@ public class GeyserSession implements CommandSender { GameProfile profile = msaAuthenticationService.getSelectedProfile(); if (profile == null) { // Java account is offline - disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode())); + disconnect(GeyserLocale.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode())); return null; } @@ -787,8 +791,8 @@ public class GeyserSession implements CommandSender { } } catch (Exception e) { - geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.encrypt_fail"), e); - disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.floodgate.encryption_fail", getClientData().getLanguageCode())); + geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.encrypt_fail"), e); + disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.floodgate.encryption_fail", getClientData().getLanguageCode())); return; } @@ -817,11 +821,11 @@ public class GeyserSession implements CommandSender { if (downstream instanceof LocalSession) { // Connected directly to the server - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect_internal", + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.connect_internal", authData.getName(), protocol.getProfile().getName())); } else { // Connected to an IP address - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect", + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.connect", authData.getName(), protocol.getProfile().getName(), remoteAddress)); } @@ -841,13 +845,13 @@ public class GeyserSession implements CommandSender { // Let the user know there locale may take some time to download // as it has to be extracted from a JAR - if (locale.equalsIgnoreCase("en_us") && !LocaleUtils.LOCALE_MAPPINGS.containsKey("en_us")) { + if (locale.equalsIgnoreCase("en_us") && !MinecraftLocale.LOCALE_MAPPINGS.containsKey("en_us")) { // This should probably be left hardcoded as it will only show for en_us clients sendMessage("Loading your locale (en_us); if this isn't already downloaded, this may take some time"); } // Download and load the language for the player - LocaleUtils.downloadAndLoadLocale(locale); + MinecraftLocale.downloadAndLoadLocale(locale); } @Override @@ -860,9 +864,9 @@ public class GeyserSession implements CommandSender { if (cause instanceof UnexpectedEncryptionException) { if (remoteAuthType != AuthType.FLOODGATE) { // Server expects online mode - disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.authentication_type_mismatch", getLocale()); + disconnectMessage = GeyserLocale.getPlayerLocaleString("geyser.network.remote.authentication_type_mismatch", getLocale()); // Explain that they may be looking for Floodgate. - geyser.getLogger().warning(LanguageUtils.getLocaleStringLog( + geyser.getLogger().warning(GeyserLocale.getLocaleStringLog( geyser.getPlatformType() == PlatformType.STANDALONE ? "geyser.network.remote.floodgate_explanation_standalone" : "geyser.network.remote.floodgate_explanation_plugin", @@ -870,22 +874,22 @@ public class GeyserSession implements CommandSender { )); } else { // Likely that Floodgate is not configured correctly. - disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.floodgate_login_error", getLocale()); + disconnectMessage = GeyserLocale.getPlayerLocaleString("geyser.network.remote.floodgate_login_error", getLocale()); if (geyser.getPlatformType() == PlatformType.STANDALONE) { - geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.remote.floodgate_login_error_standalone")); + geyser.getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.remote.floodgate_login_error_standalone")); } } } else if (cause instanceof ConnectException) { // Server is offline, probably - disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.server_offline", getLocale()); + disconnectMessage = GeyserLocale.getPlayerLocaleString("geyser.network.remote.server_offline", getLocale()); } else { disconnectMessage = MessageTranslator.convertMessageLenient(event.getReason()); } if (downstream instanceof LocalSession) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect_internal", authData.getName(), disconnectMessage)); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect_internal", authData.getName(), disconnectMessage)); } else { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect", authData.getName(), remoteAddress, disconnectMessage)); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.network.remote.disconnect", authData.getName(), remoteAddress, disconnectMessage)); } if (cause != null) { cause.printStackTrace(); @@ -897,12 +901,12 @@ public class GeyserSession implements CommandSender { @Override public void packetReceived(PacketReceivedEvent event) { Packet packet = event.getPacket(); - PacketTranslatorRegistry.JAVA_TRANSLATOR.translate(packet.getClass(), packet, GeyserSession.this); + Registries.JAVA_PACKET_TRANSLATORS.translate(packet.getClass(), packet, GeyserSession.this); } @Override public void packetError(PacketErrorEvent event) { - geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.downstream_error", event.getCause().getMessage())); + geyser.getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.downstream_error", event.getCause().getMessage())); if (geyser.getConfig().isDebugMode()) event.getCause().printStackTrace(); event.setSuppress(true); @@ -936,7 +940,7 @@ public class GeyserSession implements CommandSender { } public void close() { - disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.close", getClientData().getLanguageCode())); + disconnect(GeyserLocale.getPlayerLocaleString("geyser.network.close", getClientData().getLanguageCode())); } /** diff --git a/core/src/main/java/org/geysermc/geyser/SessionManager.java b/core/src/main/java/org/geysermc/geyser/session/SessionManager.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/SessionManager.java rename to core/src/main/java/org/geysermc/geyser/session/SessionManager.java index b6ff28a1c..c5f30d3b2 100644 --- a/core/src/main/java/org/geysermc/geyser/SessionManager.java +++ b/core/src/main/java/org/geysermc/geyser/session/SessionManager.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser; +package org.geysermc.geyser.session; import com.google.common.collect.ImmutableList; import lombok.AccessLevel; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -81,7 +81,7 @@ public final class SessionManager { public void disconnectAll(String message) { Collection sessions = getAllSessions(); for (GeyserSession session : sessions) { - session.disconnect(LanguageUtils.getPlayerLocaleString(message, session.getLocale())); + session.disconnect(GeyserLocale.getPlayerLocaleString(message, session.getLocale())); } } diff --git a/core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java b/core/src/main/java/org/geysermc/geyser/session/UpstreamSession.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java rename to core/src/main/java/org/geysermc/geyser/session/UpstreamSession.java index a96b0448f..88dc360bf 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/UpstreamSession.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session; +package org.geysermc.geyser.session; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.BedrockServerSession; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java b/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java rename to core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java index 76ea66f55..eb142eec6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java +++ b/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.auth; +package org.geysermc.geyser.session.auth; import com.fasterxml.jackson.databind.JsonNode; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/common/AuthType.java b/core/src/main/java/org/geysermc/geyser/session/auth/AuthType.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/common/AuthType.java rename to core/src/main/java/org/geysermc/geyser/session/auth/AuthType.java index ea5812663..00427e7e4 100644 --- a/core/src/main/java/org/geysermc/geyser/common/AuthType.java +++ b/core/src/main/java/org/geysermc/geyser/session/auth/AuthType.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common; +package org.geysermc.geyser.session.auth; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java b/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java rename to core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java index f463e247c..b0c0b16b0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java +++ b/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.auth; +package org.geysermc.geyser.session.auth; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/AdvancementsCache.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/AdvancementsCache.java index f8b9ca808..b6dde975c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/AdvancementsCache.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.data.game.advancement.Advancement; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSeenAdvancementsPacket; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.utils.GeyserAdvancement; -import org.geysermc.geyser.utils.LanguageUtils; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.level.GeyserAdvancement; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.text.MinecraftLocale; import org.geysermc.cumulus.SimpleForm; import org.geysermc.cumulus.response.SimpleFormResponse; @@ -72,7 +72,7 @@ public class AdvancementsCache { public void buildAndShowMenuForm() { SimpleForm.Builder builder = SimpleForm.builder() - .translator(LocaleUtils::getLocaleString, session.getLocale()) + .translator(MinecraftLocale::getLocaleString, session.getLocale()) .title("gui.advancements"); boolean hasAdvancements = false; @@ -146,7 +146,7 @@ public class AdvancementsCache { } } - builder.button(LanguageUtils.getPlayerLocaleString("gui.back", language)); + builder.button(GeyserLocale.getPlayerLocaleString("gui.back", language)); builder.responseHandler((form, responseData) -> { SimpleFormResponse response = form.parseResponse(responseData); @@ -195,7 +195,7 @@ public class AdvancementsCache { String earned = isEarned(advancement) ? "yes" : "no"; String description = getColorFromAdvancementFrameType(advancement) + MessageTranslator.convertMessage(advancement.getDisplayData().getDescription(), language); - String earnedString = LanguageUtils.getPlayerLocaleString("geyser.advancements.earned", language, LocaleUtils.getLocaleString("gui." + earned, language)); + String earnedString = GeyserLocale.getPlayerLocaleString("geyser.advancements.earned", language, MinecraftLocale.getLocaleString("gui." + earned, language)); /* Layout will look like: @@ -211,14 +211,14 @@ public class AdvancementsCache { String content = description + "\n\n§f" + earnedString + "\n"; if (!currentAdvancementCategoryId.equals(advancement.getParentId())) { // Only display the parent if it is not the category - content += LanguageUtils.getPlayerLocaleString("geyser.advancements.parentid", language, MessageTranslator.convertMessage(storedAdvancements.get(advancement.getParentId()).getDisplayData().getTitle(), language)); + content += GeyserLocale.getPlayerLocaleString("geyser.advancements.parentid", language, MessageTranslator.convertMessage(storedAdvancements.get(advancement.getParentId()).getDisplayData().getTitle(), language)); } session.sendForm( SimpleForm.builder() .title(MessageTranslator.convertMessage(advancement.getDisplayData().getTitle())) .content(content) - .button(LanguageUtils.getPlayerLocaleString("gui.back", language)) + .button(GeyserLocale.getPlayerLocaleString("gui.back", language)) .responseHandler((form, responseData) -> { SimpleFormResponse response = form.parseResponse(responseData); if (response.isCorrect()) { diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/BookEditCache.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/BookEditCache.java index 74708b442..faaeafdb9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/BookEditCache.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundEditBookPacket; import lombok.Setter; import org.geysermc.geyser.inventory.GeyserItemStack; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; /** * Manages updating the current writable book. diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java b/core/src/main/java/org/geysermc/geyser/session/cache/BossBar.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java rename to core/src/main/java/org/geysermc/geyser/session/cache/BossBar.java index 4443275e9..9595a3daf 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/BossBar.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityData; @@ -32,8 +32,8 @@ import com.nukkitx.protocol.bedrock.packet.BossEventPacket; import com.nukkitx.protocol.bedrock.packet.RemoveEntityPacket; import lombok.AllArgsConstructor; import net.kyori.adventure.text.Component; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; @AllArgsConstructor public class BossBar { diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java index 197139eba..522c00d2a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.chunk.GeyserChunk; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.level.chunk.GeyserChunk; +import org.geysermc.geyser.util.MathUtils; public class ChunkCache { private final boolean cache; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java index cd34bb50d..eb1bc6e9a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import it.unimi.dsi.fastutil.longs.Long2LongMap; import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap; @@ -32,10 +32,10 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import lombok.Getter; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.Tickable; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.Tickable; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; import java.util.*; import java.util.concurrent.atomic.AtomicLong; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/EntityEffectCache.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/EntityEffectCache.java index 12f99a384..95c059475 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/EntityEffectCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.data.game.entity.Effect; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java index 020da79e9..6f7d180de 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.nukkitx.protocol.bedrock.packet.ModalFormRequestPacket; import com.nukkitx.protocol.bedrock.packet.ModalFormResponsePacket; @@ -32,7 +32,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.RequiredArgsConstructor; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.cumulus.Form; import org.geysermc.cumulus.SimpleForm; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/LodestoneCache.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/LodestoneCache.java index adcfdbaa2..bd3c73574 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/LodestoneCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.IntTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/PistonCache.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/PistonCache.java index 67f4c490d..05e59a5bb 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/PistonCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.nukkitx.math.vector.Vector3d; import com.nukkitx.math.vector.Vector3f; @@ -33,11 +33,11 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntity; -import org.geysermc.geyser.utils.Axis; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.translator.level.block.entity.PistonBlockEntity; +import org.geysermc.geyser.level.physics.Axis; import java.util.Map; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/PreferencesCache.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/PreferencesCache.java index b71ca17ff..534045f81 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/PreferencesCache.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import lombok.Getter; import lombok.Setter; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.CooldownUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.CooldownUtils; @Getter public class PreferencesCache { diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java index 985f1ba2c..32827cfec 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateTagsPacket; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TeleportCache.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/TeleportCache.java index 7ca5b9ed5..cc9a7c09f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/TeleportCache.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.nukkitx.math.vector.Vector3d; import lombok.Data; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java b/core/src/main/java/org/geysermc/geyser/session/cache/WorldBorder.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java rename to core/src/main/java/org/geysermc/geyser/session/cache/WorldBorder.java index 65dbf3e29..5c486af49 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/WorldBorder.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.nukkitx.math.GenericMath; import com.nukkitx.math.vector.Vector2d; @@ -34,8 +34,8 @@ import com.nukkitx.protocol.bedrock.packet.PlayerFogPacket; import lombok.Getter; import lombok.Setter; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; import javax.annotation.Nonnull; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java rename to core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java index a0c4ba9c6..a9564b157 100644 --- a/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.session.cache; +package org.geysermc.geyser.session.cache; import com.github.steveice10.mc.protocol.data.game.setting.Difficulty; import lombok.Getter; import lombok.Setter; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.scoreboard.Scoreboard; import org.geysermc.geyser.scoreboard.ScoreboardUpdater.ScoreboardSession; diff --git a/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java b/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java index f9106319f..d07e06597 100644 --- a/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java +++ b/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java @@ -32,9 +32,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.Constants; -import org.geysermc.geyser.utils.PluginMessageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.Constants; +import org.geysermc.geyser.util.PluginMessageUtils; import org.geysermc.floodgate.util.WebsocketEventType; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; @@ -48,7 +48,7 @@ import java.util.List; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import static org.geysermc.geyser.utils.PluginMessageUtils.getSkinChannel; +import static org.geysermc.geyser.util.PluginMessageUtils.getSkinChannel; public final class FloodgateSkinUploader { private final ObjectMapper JACKSON = new ObjectMapper(); diff --git a/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java index eeb4a5138..454456800 100644 --- a/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java +++ b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java @@ -31,11 +31,11 @@ import com.nukkitx.protocol.bedrock.data.skin.ImageData; import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin; import com.nukkitx.protocol.bedrock.packet.PlayerListPacket; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.auth.BedrockClientData; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.auth.BedrockClientData; +import org.geysermc.geyser.text.GeyserLocale; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -192,7 +192,7 @@ public class SkinManager { session.sendUpstreamPacket(playerRemovePacket); } } catch (Exception e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e); } if (skinAndCapeConsumer != null) { @@ -204,7 +204,7 @@ public class SkinManager { public static void handleBedrockSkin(PlayerEntity playerEntity, BedrockClientData clientData) { GeyserImpl geyser = GeyserImpl.getInstance(); if (geyser.getConfig().isDebugMode()) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.register", playerEntity.getUsername(), playerEntity.getUuid())); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.skin.bedrock.register", playerEntity.getUsername(), playerEntity.getUuid())); } try { @@ -218,7 +218,7 @@ public class SkinManager { SkinProvider.storeBedrockSkin(playerEntity.getUuid(), clientData.getSkinId(), skinBytes); SkinProvider.storeBedrockGeometry(playerEntity.getUuid(), geometryNameBytes, geometryBytes); } else if (geyser.getConfig().isDebugMode()) { - geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.fail", playerEntity.getUsername())); + geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.skin.bedrock.fail", playerEntity.getUsername())); geyser.getLogger().debug("The size of '" + playerEntity.getUsername() + "' skin is: " + clientData.getSkinImageWidth() + "x" + clientData.getSkinImageHeight()); } diff --git a/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java b/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java index edb3ad36e..483d0d3e9 100644 --- a/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java +++ b/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java @@ -37,9 +37,9 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.WebUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.util.WebUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java b/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java index ae16aee05..100f06caf 100644 --- a/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java +++ b/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java @@ -29,9 +29,9 @@ import com.nukkitx.protocol.bedrock.data.skin.ImageData; import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin; import com.nukkitx.protocol.bedrock.packet.PlayerSkinPacket; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Collections; import java.util.function.Consumer; @@ -63,7 +63,7 @@ public class SkullSkinManager extends SkinManager { packet.setTrustedSkin(true); session.sendUpstreamPacket(packet); } catch (Exception e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e); } if (skinConsumer != null) { diff --git a/core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java b/core/src/main/java/org/geysermc/geyser/text/AsteriskSerializer.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java rename to core/src/main/java/org/geysermc/geyser/text/AsteriskSerializer.java index 929ac8d9a..9ff55d61b 100644 --- a/core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java +++ b/core/src/main/java/org/geysermc/geyser/text/AsteriskSerializer.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common.serializer; +package org.geysermc.geyser.text; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/core/src/main/java/org/geysermc/geyser/common/ChatColor.java b/core/src/main/java/org/geysermc/geyser/text/ChatColor.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/common/ChatColor.java rename to core/src/main/java/org/geysermc/geyser/text/ChatColor.java index 6c57cd5c1..29901d857 100644 --- a/core/src/main/java/org/geysermc/geyser/common/ChatColor.java +++ b/core/src/main/java/org/geysermc/geyser/text/ChatColor.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.common; +package org.geysermc.geyser.text; public class ChatColor { diff --git a/core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java b/core/src/main/java/org/geysermc/geyser/text/GeyserLocale.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java rename to core/src/main/java/org/geysermc/geyser/text/GeyserLocale.java index 7d1719d18..36e5aaae1 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java +++ b/core/src/main/java/org/geysermc/geyser/text/GeyserLocale.java @@ -23,9 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.text; import org.geysermc.geyser.GeyserImpl; +import org.geysermc.geyser.util.FileUtils; import java.io.InputStream; import java.io.InputStreamReader; @@ -36,7 +37,7 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; -public class LanguageUtils { +public class GeyserLocale { /** * If we determine the locale that the user wishes to use, use that locale diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java b/core/src/main/java/org/geysermc/geyser/text/GsonComponentSerializerWrapper.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java rename to core/src/main/java/org/geysermc/geyser/text/GsonComponentSerializerWrapper.java index 102780856..930d4a62c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java +++ b/core/src/main/java/org/geysermc/geyser/text/GsonComponentSerializerWrapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.chat; +package org.geysermc.geyser.text; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -38,12 +38,7 @@ import java.util.function.UnaryOperator; /** * A wrapper around a normal GsonComponentSerializer to accept null components. */ -public final class GsonComponentSerializerWrapper implements GsonComponentSerializer { - private final GsonComponentSerializer source; - - public GsonComponentSerializerWrapper(GsonComponentSerializer source) { - this.source = source; - } +public record GsonComponentSerializerWrapper(GsonComponentSerializer source) implements GsonComponentSerializer { @Override public @NotNull Gson serializer() { diff --git a/core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java b/core/src/main/java/org/geysermc/geyser/text/MinecraftLocale.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java rename to core/src/main/java/org/geysermc/geyser/text/MinecraftLocale.java index b22315f9f..2b42efc86 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java +++ b/core/src/main/java/org/geysermc/geyser/text/MinecraftLocale.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.text; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -31,6 +31,8 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.Getter; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.util.WebUtils; import java.io.*; import java.nio.file.Files; @@ -39,7 +41,7 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.zip.ZipFile; -public class LocaleUtils { +public class MinecraftLocale { public static final Map> LOCALE_MAPPINGS = new HashMap<>(); @@ -54,7 +56,7 @@ public class LocaleUtils { localesFolder.mkdir(); // Download the latest asset list and cache it - generateAssetCache().whenComplete((aVoid, ex) -> downloadAndLoadLocale(LanguageUtils.getDefaultLocale())); + generateAssetCache().whenComplete((aVoid, ex) -> downloadAndLoadLocale(GeyserLocale.getDefaultLocale())); } /** @@ -77,7 +79,7 @@ public class LocaleUtils { // Make sure we definitely got a version if (latestInfoURL.isEmpty()) { - throw new Exception(LanguageUtils.getLocaleStringLog("geyser.locale.fail.latest_version")); + throw new Exception(GeyserLocale.getLocaleStringLog("geyser.locale.fail.latest_version")); } // Get the individual version manifest @@ -104,7 +106,7 @@ public class LocaleUtils { ASSET_MAP.put(entry.getKey(), asset); } } catch (Exception e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace()))); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace()))); } return null; }); @@ -124,7 +126,7 @@ public class LocaleUtils { // Check the locale isn't already loaded if (!ASSET_MAP.containsKey("minecraft/lang/" + locale + ".json") && !locale.equals("en_us")) { - GeyserImpl.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.invalid", locale)); + GeyserImpl.getInstance().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.locale.fail.invalid", locale)); return; } @@ -207,7 +209,7 @@ public class LocaleUtils { try { localeStream = new FileInputStream(localeFile); } catch (FileNotFoundException e) { - throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage())); + throw new AssertionError(GeyserLocale.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage())); } // Parse the file as json @@ -215,7 +217,7 @@ public class LocaleUtils { try { localeObj = GeyserImpl.JSON_MAPPER.readTree(localeStream); } catch (Exception e) { - throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.json", locale), e); + throw new AssertionError(GeyserLocale.getLocaleStringLog("geyser.locale.fail.json", locale), e); } // Parse all the locale fields @@ -238,10 +240,10 @@ public class LocaleUtils { try { localeStream.close(); } catch (IOException e) { - throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage())); + throw new AssertionError(GeyserLocale.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage())); } } else { - GeyserImpl.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale)); + GeyserImpl.getInstance().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.locale.fail.missing", locale)); } } @@ -253,7 +255,7 @@ public class LocaleUtils { private static void downloadEN_US(File localeFile) { try { // Let the user know we are downloading the JAR - GeyserImpl.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us")); + GeyserImpl.getInstance().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.locale.download.en_us")); GeyserImpl.getInstance().getLogger().debug("Download URL: " + clientJarInfo.getUrl()); // Download the smallest JAR (client or server) @@ -284,9 +286,9 @@ public class LocaleUtils { // Delete the nolonger needed client/server jar Files.delete(tmpFilePath); - GeyserImpl.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us.done")); + GeyserImpl.getInstance().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.locale.download.en_us.done")); } catch (Exception e) { - GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.en_us"), e); + GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.locale.fail.en_us"), e); } } @@ -298,12 +300,12 @@ public class LocaleUtils { * @return Translated string or the original message if it was not found in the given locale */ public static String getLocaleString(String messageText, String locale) { - Map localeStrings = LocaleUtils.LOCALE_MAPPINGS.get(locale.toLowerCase()); + Map localeStrings = MinecraftLocale.LOCALE_MAPPINGS.get(locale.toLowerCase()); if (localeStrings == null) { - localeStrings = LocaleUtils.LOCALE_MAPPINGS.get(LanguageUtils.getDefaultLocale()); + localeStrings = MinecraftLocale.LOCALE_MAPPINGS.get(GeyserLocale.getDefaultLocale()); if (localeStrings == null) { // Don't cause a NPE if the locale is STILL missing - GeyserImpl.getInstance().getLogger().debug("MISSING DEFAULT LOCALE: " + LanguageUtils.getDefaultLocale()); + GeyserImpl.getInstance().getLogger().debug("MISSING DEFAULT LOCALE: " + GeyserLocale.getDefaultLocale()); return messageText; } } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java b/core/src/main/java/org/geysermc/geyser/text/MinecraftTranslationRegistry.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java rename to core/src/main/java/org/geysermc/geyser/text/MinecraftTranslationRegistry.java index a8a90c1a5..129fb1f40 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java +++ b/core/src/main/java/org/geysermc/geyser/text/MinecraftTranslationRegistry.java @@ -23,10 +23,9 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.chat; +package org.geysermc.geyser.text; import net.kyori.adventure.text.renderer.TranslatableComponentRenderer; -import org.geysermc.geyser.utils.LocaleUtils; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -46,7 +45,7 @@ public class MinecraftTranslationRegistry extends TranslatableComponentRenderer< @Override public @Nullable MessageFormat translate(@Nonnull String key, @Nonnull String locale) { // Get the locale string - String localeString = LocaleUtils.getLocaleString(key, locale); + String localeString = MinecraftLocale.getLocaleString(key, locale); // Replace the `%s` with numbered inserts `{0}` Pattern p = stringReplacement; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/BlockCollision.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/BlockCollision.java index cc84824cd..964faab0a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/BlockCollision.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import com.nukkitx.math.vector.Vector3d; import com.nukkitx.math.vector.Vector3i; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionManager; -import org.geysermc.geyser.utils.Axis; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; +import org.geysermc.geyser.level.physics.Axis; @EqualsAndHashCode public class BlockCollision { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java b/core/src/main/java/org/geysermc/geyser/translator/collision/CollisionRemapper.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/CollisionRemapper.java index c932b1f68..2156cc670 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/CollisionRemapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision; +package org.geysermc.geyser.translator.collision; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/DirtPathCollision.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/DirtPathCollision.java index 06df05054..a7babead3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/DirtPathCollision.java @@ -23,12 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionManager; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "^dirt_path$", passDefaultBoxes = true) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/DoorCollision.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/DoorCollision.java index 6c165bd1f..3c858dc92 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/DoorCollision.java @@ -23,13 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; -import com.nukkitx.math.vector.Vector3i; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "_door$", usesParams = true, passDefaultBoxes = true) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/OtherCollision.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/OtherCollision.java index eeb89b65f..2a81077ca 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/OtherCollision.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.translators.collision.BoundingBox; +import org.geysermc.geyser.level.physics.BoundingBox; @EqualsAndHashCode(callSuper = true) public class OtherCollision extends BlockCollision { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/ScaffoldingCollision.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/ScaffoldingCollision.java index be5e3c028..fddc2e39b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/ScaffoldingCollision.java @@ -23,12 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; /** * In order for scaffolding to work on Bedrock, entity flags need to be sent to the player diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/SnowCollision.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/SnowCollision.java index dc8b095b0..912d6a9b9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/SnowCollision.java @@ -23,12 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "^snow$", passDefaultBoxes = true, usesParams = true) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/SolidCollision.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/SolidCollision.java index c772ff75f..1f47d8abb 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/SolidCollision.java @@ -23,11 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.level.physics.BoundingBox; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "shulker_box$") // These have no collision in the mappings as it depends on the NBT data diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/SpawnerCollision.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/SpawnerCollision.java index cef39dba1..698b8f82d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/SpawnerCollision.java @@ -23,10 +23,9 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "^spawner$") diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/TrapdoorCollision.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java rename to core/src/main/java/org/geysermc/geyser/translator/collision/TrapdoorCollision.java index 948622640..49b9f6c3f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/TrapdoorCollision.java @@ -23,13 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.collision.translators; +package org.geysermc.geyser.translator.collision; import lombok.EqualsAndHashCode; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionManager; -import org.geysermc.geyser.network.translators.collision.CollisionRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; @EqualsAndHashCode(callSuper = true) @CollisionRemapper(regex = "_trapdoor$", usesParams = true, passDefaultBoxes = true) diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/entity/EntityMetadataTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/entity/EntityMetadataTranslator.java index fa6758210..e8eba1654 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/entity/EntityMetadataTranslator.java @@ -23,10 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.entity; +package org.geysermc.geyser.translator.entity; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType; +import org.geysermc.geyser.entity.type.Entity; import java.util.function.BiConsumer; @@ -36,4 +37,8 @@ import java.util.function.BiConsumer; public record EntityMetadataTranslator>>( MetadataType acceptedType, BiConsumer translateFunction) { + + public void translate(E entity, EM metadata) { + this.translateFunction.accept(entity, metadata); + } } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/AbstractBlockInventoryTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/AbstractBlockInventoryTranslator.java index a0b5298a7..d34f5195c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/AbstractBlockInventoryTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder; -import org.geysermc.geyser.network.translators.inventory.holder.InventoryHolder; -import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.holder.BlockInventoryHolder; +import org.geysermc.geyser.inventory.holder.InventoryHolder; +import org.geysermc.geyser.inventory.updater.InventoryUpdater; /** * Provided as a base for any inventory that requires a block for opening it diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/AnvilInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/AnvilInventoryTranslator.java index ce40f0a44..b7aaad7b1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/AnvilInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; @@ -31,9 +31,9 @@ import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; import org.geysermc.geyser.inventory.AnvilContainer; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.AnvilInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.AnvilInventoryUpdater; public class AnvilInventoryTranslator extends AbstractBlockInventoryTranslator { public AnvilInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/BaseInventoryTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/BaseInventoryTranslator.java index fb3f2cac4..becca359b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/BaseInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; @@ -31,10 +31,9 @@ import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; import org.geysermc.geyser.inventory.Container; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.SlotType; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; public abstract class BaseInventoryTranslator extends InventoryTranslator { public BaseInventoryTranslator(int size) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/BeaconInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/BeaconInventoryTranslator.java index 6a5ae2cc5..f0820d9e8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/BeaconInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetBeaconPacket; @@ -41,12 +41,11 @@ import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket; import org.geysermc.geyser.inventory.BeaconContainer; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.holder.BlockInventoryHolder; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.util.InventoryUtils; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/BrewingInventoryTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/BrewingInventoryTranslator.java index a38fbe126..43bea55ab 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/BrewingInventoryTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.ContainerInventoryUpdater; public class BrewingInventoryTranslator extends AbstractBlockInventoryTranslator { public BrewingInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/CartographyInventoryTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/CartographyInventoryTranslator.java index 3e16635ed..08caa7784 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/CartographyInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; @@ -32,9 +32,9 @@ import org.geysermc.geyser.inventory.CartographyContainer; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; public class CartographyInventoryTranslator extends AbstractBlockInventoryTranslator { public CartographyInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/CraftingInventoryTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/CraftingInventoryTranslator.java index 6baf2b9ca..ea01dc43d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/CraftingInventoryTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; public class CraftingInventoryTranslator extends AbstractBlockInventoryTranslator { public CraftingInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/EnchantingInventoryTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/EnchantingInventoryTranslator.java index f0bf1a993..f18a902ff 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/EnchantingInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket; @@ -37,10 +37,10 @@ import org.geysermc.geyser.inventory.EnchantingContainer; import org.geysermc.geyser.inventory.GeyserEnchantOption; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; -import org.geysermc.geyser.network.translators.item.Enchantment; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.inventory.item.Enchantment; import java.util.Arrays; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/Generic3X3InventoryTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/Generic3X3InventoryTranslator.java index eaef37335..4265b39e3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/Generic3X3InventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; @@ -31,9 +31,9 @@ import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; import org.geysermc.geyser.inventory.Generic3X3Container; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.ContainerInventoryUpdater; /** * Droppers and dispensers diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/GrindstoneInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/GrindstoneInventoryTranslator.java index 501c4be58..fae539db8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/GrindstoneInventoryTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; public class GrindstoneInventoryTranslator extends AbstractBlockInventoryTranslator { public GrindstoneInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/HopperInventoryTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/HopperInventoryTranslator.java index 44fff7406..9356dcfb6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/HopperInventoryTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.ContainerInventoryUpdater; /** * Implemented on top of any block that does not have special properties implemented diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/InventoryTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/InventoryTranslator.java index 1c11da986..5ddd12702 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/InventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -46,17 +46,18 @@ import org.geysermc.geyser.inventory.CartographyContainer; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.click.Click; -import org.geysermc.geyser.network.translators.inventory.click.ClickPlan; -import org.geysermc.geyser.network.translators.inventory.translators.*; -import org.geysermc.geyser.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.chest.SingleChestInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.furnace.BlastFurnaceInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.furnace.FurnaceInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.furnace.SmokerInventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; -import org.geysermc.geyser.utils.ItemUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.inventory.click.Click; +import org.geysermc.geyser.inventory.click.ClickPlan; +import org.geysermc.geyser.translator.inventory.chest.DoubleChestInventoryTranslator; +import org.geysermc.geyser.translator.inventory.chest.SingleChestInventoryTranslator; +import org.geysermc.geyser.translator.inventory.furnace.BlastFurnaceInventoryTranslator; +import org.geysermc.geyser.translator.inventory.furnace.FurnaceInventoryTranslator; +import org.geysermc.geyser.translator.inventory.furnace.SmokerInventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; +import org.geysermc.geyser.util.ItemUtils; import java.util.*; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/LecternInventoryTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/LecternInventoryTranslator.java index 7b0f4a5f0..b59914a13 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/LecternInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket; @@ -39,10 +39,10 @@ import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.LecternContainer; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater; -import org.geysermc.geyser.utils.BlockEntityUtils; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.updater.InventoryUpdater; +import org.geysermc.geyser.util.BlockEntityUtils; +import org.geysermc.geyser.util.InventoryUtils; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/LoomInventoryTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/LoomInventoryTranslator.java index bdf5de762..d035543bc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/LoomInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -43,11 +43,11 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; -import org.geysermc.geyser.network.translators.item.translators.BannerTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.translator.inventory.item.BannerTranslator; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java index 130e7cca9..cf0c475f0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; import com.nukkitx.math.vector.Vector3f; @@ -34,16 +34,16 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemStackRequest; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket; import com.nukkitx.protocol.bedrock.packet.SetEntityLinkPacket; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.MerchantContainer; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.inventory.updater.InventoryUpdater; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; public class MerchantInventoryTranslator extends BaseInventoryTranslator { private final InventoryUpdater updater; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java index ace0ae665..3a451891c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -39,20 +39,19 @@ import it.unimi.dsi.fastutil.ints.IntSet; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.utils.InventoryUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.util.InventoryUtils; +import org.geysermc.geyser.text.GeyserLocale; import java.util.Arrays; import java.util.Collections; import java.util.function.IntFunction; public class PlayerInventoryTranslator extends InventoryTranslator { - private static final IntFunction UNUSUABLE_CRAFTING_SPACE_BLOCK = InventoryUtils.createUnusableSpaceBlock(LanguageUtils.getLocaleStringLog("geyser.inventory.unusable_item.creative")); + private static final IntFunction UNUSUABLE_CRAFTING_SPACE_BLOCK = InventoryUtils.createUnusableSpaceBlock(GeyserLocale.getLocaleStringLog("geyser.inventory.unusable_item.creative")); public PlayerInventoryTranslator() { super(46); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/ShulkerInventoryTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/ShulkerInventoryTranslator.java index a924c05b7..f92474fb3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/ShulkerInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.nukkitx.math.vector.Vector3i; @@ -33,11 +33,11 @@ import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder; -import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.holder.BlockInventoryHolder; +import org.geysermc.geyser.inventory.updater.ContainerInventoryUpdater; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; import org.geysermc.geyser.registry.Registries; public class ShulkerInventoryTranslator extends AbstractBlockInventoryTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/SmithingInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/SmithingInventoryTranslator.java index 3b8d05c69..4e34bca14 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/SmithingInventoryTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; public class SmithingInventoryTranslator extends AbstractBlockInventoryTranslator { public SmithingInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/StonecutterInventoryTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/StonecutterInventoryTranslator.java index f2b8ac354..ed1f38799 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/StonecutterInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators; +package org.geysermc.geyser.translator.inventory; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType; @@ -40,11 +40,11 @@ import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; import org.geysermc.geyser.inventory.StonecutterContainer; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.inventory.updater.UIInventoryUpdater; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; public class StonecutterInventoryTranslator extends AbstractBlockInventoryTranslator { public StonecutterInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/ChestInventoryTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/chest/ChestInventoryTranslator.java index 6a88d26d4..417aa5bf3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/ChestInventoryTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.chest; +package org.geysermc.geyser.translator.inventory.chest; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.translators.BaseInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.updater.ChestInventoryUpdater; -import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.translator.inventory.BaseInventoryTranslator; +import org.geysermc.geyser.inventory.updater.ChestInventoryUpdater; +import org.geysermc.geyser.inventory.updater.InventoryUpdater; public abstract class ChestInventoryTranslator extends BaseInventoryTranslator { private final InventoryUpdater updater; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/DoubleChestInventoryTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/chest/DoubleChestInventoryTranslator.java index 838b11978..a42001d34 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/DoubleChestInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.chest; +package org.geysermc.geyser.translator.inventory.chest; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; @@ -35,10 +35,10 @@ import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket; import org.geysermc.geyser.inventory.Container; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.DoubleChestValue; -import org.geysermc.geyser.network.translators.world.block.entity.DoubleChestBlockEntityTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.level.block.DoubleChestValue; +import org.geysermc.geyser.translator.level.block.entity.DoubleChestBlockEntityTranslator; import org.geysermc.geyser.registry.BlockRegistries; public class DoubleChestInventoryTranslator extends ChestInventoryTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/SingleChestInventoryTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/chest/SingleChestInventoryTranslator.java index d6348bc7e..86696b21b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/chest/SingleChestInventoryTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.chest; +package org.geysermc.geyser.translator.inventory.chest; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder; -import org.geysermc.geyser.network.translators.inventory.holder.InventoryHolder; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.holder.BlockInventoryHolder; +import org.geysermc.geyser.inventory.holder.InventoryHolder; public class SingleChestInventoryTranslator extends ChestInventoryTranslator { private final InventoryHolder holder; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/AbstractFurnaceInventoryTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/AbstractFurnaceInventoryTranslator.java index d2fa100a6..de7ea4de7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/AbstractFurnaceInventoryTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.furnace; +package org.geysermc.geyser.translator.inventory.furnace; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; -import org.geysermc.geyser.network.translators.inventory.SlotType; -import org.geysermc.geyser.network.translators.inventory.translators.AbstractBlockInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.SlotType; +import org.geysermc.geyser.translator.inventory.AbstractBlockInventoryTranslator; +import org.geysermc.geyser.inventory.updater.ContainerInventoryUpdater; public abstract class AbstractFurnaceInventoryTranslator extends AbstractBlockInventoryTranslator { AbstractFurnaceInventoryTranslator(String javaBlockIdentifier, ContainerType containerType) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/BlastFurnaceInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/BlastFurnaceInventoryTranslator.java index 7d1b14683..7839d5370 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/BlastFurnaceInventoryTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.furnace; +package org.geysermc.geyser.translator.inventory.furnace; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.BedrockContainerSlot; public class BlastFurnaceInventoryTranslator extends AbstractFurnaceInventoryTranslator { public BlastFurnaceInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/FurnaceInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/FurnaceInventoryTranslator.java index e6c563bd5..5c9030197 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/FurnaceInventoryTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.furnace; +package org.geysermc.geyser.translator.inventory.furnace; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.BedrockContainerSlot; public class FurnaceInventoryTranslator extends AbstractFurnaceInventoryTranslator { public FurnaceInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/SmokerInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/SmokerInventoryTranslator.java index 68583c8b0..350e00de3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/furnace/SmokerInventoryTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.furnace; +package org.geysermc.geyser.translator.inventory.furnace; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.BedrockContainerSlot; public class SmokerInventoryTranslator extends AbstractFurnaceInventoryTranslator { public SmokerInventoryTranslator() { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/AbstractHorseInventoryTranslator.java similarity index 84% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/horse/AbstractHorseInventoryTranslator.java index d9549e5a8..b4c49cb12 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/AbstractHorseInventoryTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.horse; +package org.geysermc.geyser.translator.inventory.horse; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.translators.BaseInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.updater.HorseInventoryUpdater; -import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.BaseInventoryTranslator; +import org.geysermc.geyser.inventory.updater.HorseInventoryUpdater; +import org.geysermc.geyser.inventory.updater.InventoryUpdater; public abstract class AbstractHorseInventoryTranslator extends BaseInventoryTranslator { private final InventoryUpdater updater; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/ChestedHorseInventoryTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/horse/ChestedHorseInventoryTranslator.java index bd7cfb9f9..79f34da57 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/ChestedHorseInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.horse; +package org.geysermc.geyser.translator.inventory.horse; import com.nukkitx.protocol.bedrock.data.inventory.ContainerId; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; @@ -31,8 +31,8 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.inventory.BedrockContainerSlot; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/DonkeyInventoryTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/horse/DonkeyInventoryTranslator.java index f73c43973..ea0a580f0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/DonkeyInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.horse; +package org.geysermc.geyser.translator.inventory.horse; public class DonkeyInventoryTranslator extends ChestedHorseInventoryTranslator { public DonkeyInventoryTranslator(int size) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/HorseInventoryTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/horse/HorseInventoryTranslator.java index da06a5c18..429125362 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/HorseInventoryTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.horse; +package org.geysermc.geyser.translator.inventory.horse; import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType; import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData; -import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot; +import org.geysermc.geyser.inventory.BedrockContainerSlot; public class HorseInventoryTranslator extends AbstractHorseInventoryTranslator { public HorseInventoryTranslator(int size) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/LlamaInventoryTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/horse/LlamaInventoryTranslator.java index c7e98d7c1..97aa7edf2 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/horse/LlamaInventoryTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.inventory.translators.horse; +package org.geysermc.geyser.translator.inventory.horse; public class LlamaInventoryTranslator extends ChestedHorseInventoryTranslator { public LlamaInventoryTranslator(int size) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/BannerTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/BannerTranslator.java index f905d015e..d2c9e5dd6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/BannerTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.*; @@ -33,8 +33,6 @@ import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.nbt.NbtType; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.ItemTranslator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/CompassTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/CompassTranslator.java index 7eb3f7a3e..7367e28db 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/CompassTranslator.java @@ -23,14 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.*; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.ItemTranslator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemRemapper.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemRemapper.java index 57947d497..651228c15 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemRemapper.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators; +package org.geysermc.geyser.translator.inventory.item; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java index 3429dcdd7..046db67c9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.*; @@ -35,14 +35,13 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; -import org.geysermc.geyser.utils.FileUtils; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.util.FileUtils; +import org.geysermc.geyser.text.MinecraftLocale; import javax.annotation.Nonnull; import java.util.*; @@ -445,7 +444,7 @@ public abstract class ItemTranslator { String translationKey = mapping.getTranslationString(); // Reset formatting since Bedrock defaults to italics - display.put(new StringTag("Name", "§r§" + translationColor + LocaleUtils.getLocaleString(translationKey, session.getLocale()))); + display.put(new StringTag("Name", "§r§" + translationColor + MinecraftLocale.getLocaleString(translationKey, session.getLocale()))); } return tag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/NbtItemStackTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/NbtItemStackTranslator.java index bac48bdd0..6c2c501fd 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/NbtItemStackTranslator.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.type.ItemMapping; public class NbtItemStackTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/PotionTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/PotionTranslator.java index 6c7cde0b0..5455b1189 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/PotionTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.StringTag; @@ -31,9 +31,7 @@ import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.Potion; +import org.geysermc.geyser.inventory.item.Potion; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/TippedArrowTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/TippedArrowTranslator.java index 7c2f929ee..01ecbb09f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/TippedArrowTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators; +package org.geysermc.geyser.translator.inventory.item; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.StringTag; @@ -31,9 +31,7 @@ import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.network.MinecraftProtocol; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.network.translators.item.TippedArrowPotion; +import org.geysermc.geyser.inventory.item.TippedArrowPotion; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/AxolotlBucketTranslator.java similarity index 83% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/AxolotlBucketTranslator.java index 0cf9c5041..071ead230 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/AxolotlBucketTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.ByteTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.StringTag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.text.MinecraftLocale; @ItemRemapper public class AxolotlBucketTranslator extends NbtItemStackTranslator { @@ -42,7 +42,7 @@ public class AxolotlBucketTranslator extends NbtItemStackTranslator { // Bedrock Edition displays the properties of the axolotl. Java does not. // To work around this, set the custom name to the Axolotl translation and it's displayed correctly itemTag.put(new ByteTag("AppendCustomName", (byte) 1)); - itemTag.put(new StringTag("CustomName", LocaleUtils.getLocaleString("entity.minecraft.axolotl", session.getLocale()))); + itemTag.put(new StringTag("CustomName", MinecraftLocale.getLocaleString("entity.minecraft.axolotl", session.getLocale()))); // Boilerplate required so the nametag does not appear as "Bucket of " itemTag.put(new StringTag("ColorID", "")); itemTag.put(new StringTag("BodyID", "")); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BasicItemTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BasicItemTranslator.java index d0a7d93a3..10ad58544 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BasicItemTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.*; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.ItemUtils; +import org.geysermc.geyser.util.ItemUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BookPagesTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BookPagesTranslator.java index 0ee644359..b3371aab7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/BookPagesTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.Tag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/CrossbowTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/CrossbowTranslator.java index 21deac983..e1dda45ed 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/CrossbowTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.opennbt.tag.builtin.*; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; @ItemRemapper diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantedBookTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantedBookTranslator.java index 5dfdb192a..8a009bc2d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantedBookTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.Tag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; @ItemRemapper(priority = 1) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java index f4352f3c3..ddc5f3780 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.*; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; -import org.geysermc.geyser.network.translators.item.Enchantment; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; +import org.geysermc.geyser.inventory.item.Enchantment; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkBaseTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkBaseTranslator.java index 31e58f984..c68f4f4d9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkBaseTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag; import com.github.steveice10.opennbt.tag.builtin.ByteTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; -import org.geysermc.geyser.utils.FireworkColor; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; +import org.geysermc.geyser.level.FireworkColor; +import org.geysermc.geyser.util.MathUtils; /** * Stores common code for firework rockets and firework stars. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkRocketTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkRocketTranslator.java index 624c7b5ff..8c1154dea 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkRocketTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.ByteTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.Tag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.util.MathUtils; @ItemRemapper public class FireworkRocketTranslator extends FireworkBaseTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkStarTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkStarTranslator.java index 68c87f2cb..e66589f6d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/FireworkStarTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; import com.github.steveice10.opennbt.tag.builtin.IntTag; import com.github.steveice10.opennbt.tag.builtin.Tag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; import org.geysermc.geyser.registry.type.ItemMapping; @ItemRemapper diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LeatherArmorTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LeatherArmorTranslator.java index abd6e24ed..ddf76b595 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LeatherArmorTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.IntTag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LodestoneCompassTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LodestoneCompassTranslator.java index 25c00ec0a..924735626 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/LodestoneCompassTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.*; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; @ItemRemapper diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/MapItemTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/MapItemTranslator.java index 9eb1693c8..23739340e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/MapItemTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.*; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; @ItemRemapper diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/PlayerHeadTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/PlayerHeadTranslator.java index a3f3f10a0..1e182568a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/PlayerHeadTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.Tag; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.text.MinecraftLocale; @ItemRemapper public class PlayerHeadTranslator extends NbtItemStackTranslator { @@ -56,7 +56,7 @@ public class PlayerHeadTranslator extends NbtItemStackTranslator { } // Add correct name of player skull // TODO: It's always yellow, even with a custom name. Handle? - String displayName = "\u00a7r\u00a7e" + LocaleUtils.getLocaleString("block.minecraft.player_head.named", session.getLocale()).replace("%s", name.getValue()); + String displayName = "\u00a7r\u00a7e" + MinecraftLocale.getLocaleString("block.minecraft.player_head.named", session.getLocale()).replace("%s", name.getValue()); if (!itemTag.contains("display")) { itemTag.put(new CompoundTag("display")); } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/ShulkerBoxItemTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/ShulkerBoxItemTranslator.java index f7fbbab54..f4160ec08 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/ShulkerBoxItemTranslator.java @@ -23,15 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.mc.protocol.data.game.Identifier; import com.github.steveice10.opennbt.tag.builtin.*; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.item.*; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; +import org.geysermc.geyser.util.MathUtils; @ItemRemapper public class ShulkerBoxItemTranslator extends NbtItemStackTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/TropicalFishBucketTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/TropicalFishBucketTranslator.java index 6b6d17933..316ebc1ae 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/TropicalFishBucketTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.item.translators.nbt; +package org.geysermc.geyser.translator.inventory.item.nbt; import com.github.steveice10.opennbt.tag.builtin.*; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextDecoration; -import org.geysermc.geyser.entity.living.animal.TropicalFishEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.ItemRemapper; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator; +import org.geysermc.geyser.entity.type.living.animal.TropicalFishEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.item.ItemRemapper; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.translator.inventory.item.NbtItemStackTranslator; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.text.MinecraftLocale; import java.util.ArrayList; import java.util.List; @@ -50,7 +50,7 @@ public class TropicalFishBucketTranslator extends NbtItemStackTranslator { public void translateToBedrock(GeyserSession session, CompoundTag itemTag, ItemMapping mapping) { // Prevent name from appearing as "Bucket of" itemTag.put(new ByteTag("AppendCustomName", (byte) 1)); - itemTag.put(new StringTag("CustomName", LocaleUtils.getLocaleString("entity.minecraft.tropical_fish", session.getLocale()))); + itemTag.put(new StringTag("CustomName", MinecraftLocale.getLocaleString("entity.minecraft.tropical_fish", session.getLocale()))); // Add Java's client side lore tag Tag bucketVariantTag = itemTag.get("BucketVariantTag"); if (bucketVariantTag instanceof IntTag) { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java index 7f24dfe94..6cafb6012 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world; +package org.geysermc.geyser.translator.level; import com.github.steveice10.mc.protocol.data.game.chunk.BitStorage; import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette; @@ -35,14 +35,14 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntLists; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.chunk.BlockStorage; -import org.geysermc.geyser.network.translators.world.chunk.GeyserChunkSection; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArray; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArrayVersion; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.SingletonBitArray; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.chunk.BlockStorage; +import org.geysermc.geyser.level.chunk.GeyserChunkSection; +import org.geysermc.geyser.level.chunk.bitarray.BitArray; +import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion; +import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.MathUtils; +import org.geysermc.geyser.util.MathUtils; // Array index formula by https://wiki.vg/Chunk_Format public class BiomeTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BannerBlockEntityTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BannerBlockEntityTranslator.java index e0911738d..9cd1981c6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BannerBlockEntityTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.translators.item.translators.BannerTranslator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.translator.inventory.item.BannerTranslator; +import org.geysermc.geyser.level.block.BlockStateValues; @BlockEntity(type = BlockEntityType.BANNER) public class BannerBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BeaconBlockEntityTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BeaconBlockEntityTranslator.java index 1c0007cc4..d6492bffe 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BeaconBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedBlockEntityTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedBlockEntityTranslator.java index 76a2e1726..fe7971105 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedBlockEntityTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.level.block.BlockStateValues; @BlockEntity(type = BlockEntityType.BED) public class BedBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedrockOnlyBlockEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedrockOnlyBlockEntity.java index e1a3ffb45..bc96a6e0d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BedrockOnlyBlockEntity.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; /** * Implemented only if a block is a block entity in Bedrock and not Java Edition. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntity.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntity.java index 987f62151..32b765166 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java index 84d86e36e..03e2bb3de 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -32,7 +32,7 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.utils.BlockEntityUtils; +import org.geysermc.geyser.util.BlockEntityUtils; /** * The class that all block entities (on both Java and Bedrock) should translate with diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CampfireBlockEntityTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CampfireBlockEntityTranslator.java index 255d8a52c..7880f8106 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CampfireBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CommandBlockBlockEntityTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CommandBlockBlockEntityTranslator.java index 68d0e76fa..bb01e4d39 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/CommandBlockBlockEntityTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.*; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.translator.text.MessageTranslator; @BlockEntity(type = BlockEntityType.COMMAND_BLOCK) public class CommandBlockBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java index 43c872a75..e41f9e492 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.DoubleChestValue; -import org.geysermc.geyser.utils.BlockEntityUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.level.block.DoubleChestValue; +import org.geysermc.geyser.util.BlockEntityUtils; /** * Chests have more block entity properties in Bedrock, which is solved by implementing the BedrockOnlyBlockEntity diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EmptyBlockEntityTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EmptyBlockEntityTranslator.java index 259beb742..e5abe74a7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EmptyBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.nbt.NbtMapBuilder; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EndGatewayBlockEntityTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EndGatewayBlockEntityTranslator.java index 310d272a6..530bcf241 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/EndGatewayBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/FlowerPotBlockEntityTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/FlowerPotBlockEntityTranslator.java index b497e6eab..b6c498d9f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/FlowerPotBlockEntityTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.utils.BlockEntityUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.util.BlockEntityUtils; public class FlowerPotBlockEntityTranslator implements BedrockOnlyBlockEntity { /** diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/JigsawBlockBlockEntityTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/JigsawBlockBlockEntityTranslator.java index b38a370a5..a94804164 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/JigsawBlockBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/NoteblockBlockEntityTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/NoteblockBlockEntityTranslator.java index 8adea545d..1d61d0e30 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/NoteblockBlockEntityTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.BlockEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; /** * Does not implement BlockEntityTranslator because it's only a block entity in Bedrock diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntity.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntity.java index dca5a6ed9..1363f6641 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.value.PistonValueType; import com.nukkitx.math.vector.Vector3d; @@ -37,14 +37,16 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import lombok.Getter; import org.geysermc.common.PlatformType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.PistonCache; -import org.geysermc.geyser.network.translators.collision.BoundingBox; -import org.geysermc.geyser.network.translators.collision.CollisionManager; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.level.physics.Axis; +import org.geysermc.geyser.level.physics.Direction; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.PistonCache; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.*; +import org.geysermc.geyser.util.*; import java.util.LinkedList; import java.util.Map; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntityTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntityTranslator.java index c39112fb2..2f29cdef6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/PistonBlockEntityTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.level.block.BlockStateValues; /** * Pistons are a special case where they are only a block entity on Bedrock. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/RequiresBlockState.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/RequiresBlockState.java index b6df97ec2..990ae314e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/RequiresBlockState.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; /** * Implemented in block entities if their Java block state is required for additional values in Bedrock diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/ShulkerBoxBlockEntityTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/ShulkerBoxBlockEntityTranslator.java index ad2855f0a..8b934f29b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/ShulkerBoxBlockEntityTranslator.java @@ -23,19 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.translator.inventory.ShulkerInventoryTranslator; import javax.annotation.Nullable; @BlockEntity(type = BlockEntityType.SHULKER_BOX) public class ShulkerBoxBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { /** - * Also used in {@link org.geysermc.geyser.network.translators.inventory.translators.ShulkerInventoryTranslator} + * Also used in {@link ShulkerInventoryTranslator} * where {@code tag} is passed as null. */ @Override diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SignBlockEntityTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SignBlockEntityTranslator.java index 386e16fb8..0eaabae12 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SignBlockEntityTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.nbt.NbtMapBuilder; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.utils.SignUtils; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.util.SignUtils; @BlockEntity(type = BlockEntityType.SIGN) public class SignBlockEntityTranslator extends BlockEntityTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SkullBlockEntityTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SkullBlockEntityTranslator.java index f32fef041..b6b41db6d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SkullBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; @@ -34,9 +34,9 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.geyser.entity.player.SkullPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.type.player.SkullPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.skin.SkinProvider; import org.geysermc.geyser.skin.SkullSkinManager; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SpawnerBlockEntityTranslator.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SpawnerBlockEntityTranslator.java index 017cd03b7..d9aebc479 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SpawnerBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.block.entity; +package org.geysermc.geyser.translator.level.block.entity; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java b/core/src/main/java/org/geysermc/geyser/translator/level/event/LevelEventTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java rename to core/src/main/java/org/geysermc/geyser/translator/level/event/LevelEventTranslator.java index 2949bfad4..63bf0a7d9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/event/LevelEventTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.event; +package org.geysermc.geyser.translator.level.event; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; /** * Represents an event capable of translating itself into bedrock */ -public interface LevelEventTransformer { +public interface LevelEventTranslator { /** * Translates the given {@link ClientboundLevelEventPacket} into bedrock and sends it upstream. * * @param session GeyserSession * @param packet the effect packet to handle */ - void handleLevelEvent(GeyserSession session, ClientboundLevelEventPacket packet); + void translate(GeyserSession session, ClientboundLevelEventPacket packet); } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java b/core/src/main/java/org/geysermc/geyser/translator/level/event/PlaySoundEventTranslator.java similarity index 83% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java rename to core/src/main/java/org/geysermc/geyser/translator/level/event/PlaySoundEventTranslator.java index 194b62948..df882d0d0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/event/PlaySoundEventTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.event; +package org.geysermc.geyser.translator.level.event; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -public record PlaySoundEventTransformer(String name, float volume, boolean pitchSub, float pitchMul, - float pitchAdd, boolean relative) implements LevelEventTransformer { +public record PlaySoundEventTranslator(String name, float volume, boolean pitchSub, float pitchMul, + float pitchAdd, boolean relative) implements LevelEventTranslator { @Override - public void handleLevelEvent(GeyserSession session, ClientboundLevelEventPacket packet) { + public void translate(GeyserSession session, ClientboundLevelEventPacket packet) { Random rand = ThreadLocalRandom.current(); PlaySoundPacket playSoundPacket = new PlaySoundPacket(); playSoundPacket.setSound(name); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java b/core/src/main/java/org/geysermc/geyser/translator/level/event/SoundEventEventTranslator.java similarity index 84% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java rename to core/src/main/java/org/geysermc/geyser/translator/level/event/SoundEventEventTranslator.java index 425e28c9b..5c3e890a2 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/event/SoundEventEventTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.event; +package org.geysermc.geyser.translator.level.event; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; -public record SoundEventEventTransformer(SoundEvent soundEvent, - String identifier, int extraData) implements LevelEventTransformer { +public record SoundEventEventTranslator(SoundEvent soundEvent, + String identifier, int extraData) implements LevelEventTranslator { @Override - public void handleLevelEvent(GeyserSession session, ClientboundLevelEventPacket packet) { + public void translate(GeyserSession session, ClientboundLevelEventPacket packet) { LevelSoundEventPacket levelSoundEvent = new LevelSoundEventPacket(); levelSoundEvent.setSound(soundEvent); levelSoundEvent.setIdentifier(identifier); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java b/core/src/main/java/org/geysermc/geyser/translator/level/event/SoundLevelEventTranslator.java similarity index 83% rename from core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java rename to core/src/main/java/org/geysermc/geyser/translator/level/event/SoundLevelEventTranslator.java index f15d2a7ad..48a4bf2fd 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java +++ b/core/src/main/java/org/geysermc/geyser/translator/level/event/SoundLevelEventTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.world.event; +package org.geysermc.geyser.translator.level.event; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; -public record SoundLevelEventTransformer(LevelEventType levelEventType, - int data) implements LevelEventTransformer { +public record SoundLevelEventTranslator(LevelEventType levelEventType, + int data) implements LevelEventTranslator { @Override - public void handleLevelEvent(GeyserSession session, ClientboundLevelEventPacket packet) { + public void translate(GeyserSession session, ClientboundLevelEventPacket packet) { LevelEventPacket eventPacket = new LevelEventPacket(); eventPacket.setType(levelEventType); eventPacket.setData(data); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/PacketTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/PacketTranslator.java index b10d62b33..37485120d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/PacketTranslator.java @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators; +package org.geysermc.geyser.translator.protocol; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public abstract class PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/Translator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/Translator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/Translator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/Translator.java index ceb254fa2..3dc812170 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/Translator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/Translator.java @@ -22,7 +22,7 @@ * @author GeyserMC * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators; +package org.geysermc.geyser.translator.protocol; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -30,5 +30,4 @@ import java.lang.annotation.RetentionPolicy; @Retention(value = RetentionPolicy.RUNTIME) public @interface Translator { Class packet(); - } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAdventureSettingsTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAdventureSettingsTranslator.java index 1a3cb4c05..d4de9e22a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAdventureSettingsTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket; import com.nukkitx.protocol.bedrock.data.AdventureSetting; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.AdventureSettingsPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = AdventureSettingsPacket.class) public class BedrockAdventureSettingsTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAnimateTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAnimateTranslator.java index 52c4d8a38..d52a66be7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockAnimateTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundPaddleBoatPacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket; import com.nukkitx.protocol.bedrock.packet.AnimatePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java index 65eadc610..828f5a934 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockEntityDataTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetJigsawBlockPacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket; import com.nukkitx.nbt.NbtMap; import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.SignUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.SignUtils; @Translator(packet = BlockEntityDataPacket.class) public class BedrockBlockEntityDataTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockPickRequestTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockPickRequestTranslator.java index 1d34ec07b..a0bd43455 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBlockPickRequestTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.BlockPickRequestPacket; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.ItemFrameEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.entity.type.ItemFrameEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.util.InventoryUtils; @Translator(packet = BlockPickRequestPacket.class) public class BedrockBlockPickRequestTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBookEditTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBookEditTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBookEditTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBookEditTranslator.java index afc2a4e77..bead427db 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBookEditTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockBookEditTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundEditBookPacket; @@ -33,9 +33,9 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.protocol.bedrock.packet.BookEditPacket; import org.geysermc.geyser.inventory.GeyserItemStack; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandBlockUpdateTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandBlockUpdateTranslator.java index 138b69b6e..f0cf4ff8c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandBlockUpdateTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.level.block.CommandBlockMode; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandMinecartPacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandBlockPacket; import com.nukkitx.protocol.bedrock.packet.CommandBlockUpdatePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = CommandBlockUpdatePacket.class) public class BedrockCommandBlockUpdateTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java index 636caf703..a67b81434 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import org.geysermc.common.PlatformType; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.command.CommandManager; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket; import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = CommandRequestPacket.class) public class BedrockCommandRequestTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockContainerCloseTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockContainerCloseTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockContainerCloseTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockContainerCloseTranslator.java index 9c05d3ddd..4c1f55018 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockContainerCloseTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockContainerCloseTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClosePacket; import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.MerchantContainer; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.InventoryUtils; @Translator(packet = ContainerClosePacket.class) public class BedrockContainerCloseTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEmoteListTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEmoteListTranslator.java index 54adbab8a..dac5fe638 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEmoteListTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.nukkitx.protocol.bedrock.packet.EmoteListPacket; import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = EmoteListPacket.class) public class BedrockEmoteListTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEntityPickRequestTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEntityPickRequestTranslator.java index ed236d7e7..732142573 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEntityPickRequestTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.nukkitx.protocol.bedrock.packet.EntityPickRequestPacket; -import org.geysermc.geyser.entity.BoatEntity; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.BoatEntity; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.util.InventoryUtils; import java.util.Locale; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockFilterTextTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockFilterTextTranslator.java index 99ebdfa6d..b7961c8fb 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockFilterTextTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket; import com.nukkitx.protocol.bedrock.packet.FilterTextPacket; import org.geysermc.geyser.inventory.AnvilContainer; import org.geysermc.geyser.inventory.CartographyContainer; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.utils.ItemUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.util.ItemUtils; /** * Used to send strings to the server and filter out unwanted words. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java index 33c475cb1..d779ab339 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.object.Direction; @@ -40,20 +40,20 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.data.inventory.*; import com.nukkitx.protocol.bedrock.packet.*; -import org.geysermc.geyser.entity.CommandBlockMinecartEntity; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.CommandBlockMinecartEntity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.ItemFrameEntity; +import org.geysermc.geyser.entity.type.ItemFrameEntity; import org.geysermc.geyser.inventory.GeyserItemStack; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.sound.EntitySoundInteractionTranslator; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMappings; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.util.BlockUtils; import java.util.concurrent.TimeUnit; @@ -366,7 +366,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPlayerInputTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPlayerInputTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPlayerInputTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPlayerInputTranslator.java index a1b807a6a..75199ae74 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPlayerInputTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPlayerInputTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundMoveVehiclePacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundPlayerInputPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.PlayerInputPacket; -import org.geysermc.geyser.entity.BoatEntity; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.BoatEntity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity; -import org.geysermc.geyser.entity.living.animal.horse.LlamaEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity; +import org.geysermc.geyser.entity.type.living.animal.horse.LlamaEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * Sent by the client for minecarts and boats. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java index eaacfe65a..59082ccdc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockPositionTrackingDBClientRequestTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.nbt.NbtType; import com.nukkitx.protocol.bedrock.packet.PositionTrackingDBClientRequestPacket; import com.nukkitx.protocol.bedrock.packet.PositionTrackingDBServerBroadcastPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.LodestoneCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.LodestoneCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.DimensionUtils; @Translator(packet = PositionTrackingDBClientRequestPacket.class) public class BedrockPositionTrackingDBClientRequestTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRespawnTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRespawnTranslator.java index 8cefa57d3..59712da7f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRespawnTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.data.game.ClientCommand; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; import com.nukkitx.protocol.bedrock.packet.RespawnPacket; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = RespawnPacket.class) public class BedrockRespawnTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java index b19626a6b..1840c9b0d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.nukkitx.protocol.bedrock.packet.ServerSettingsRequestPacket; import com.nukkitx.protocol.bedrock.packet.ServerSettingsResponsePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.SettingsUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.SettingsUtils; import org.geysermc.cumulus.CustomForm; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java index 8f3d734d7..bc6d1f4e4 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.nukkitx.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.LoginEncryptionUtils; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.LoginEncryptionUtils; @Translator(packet = SetLocalPlayerAsInitializedPacket.class) public class BedrockSetLocalPlayerAsInitializedTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockShowCreditsTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockShowCreditsTranslator.java index 95de61b54..19797b8a2 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockShowCreditsTranslator.java @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import com.github.steveice10.mc.protocol.data.game.ClientCommand; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockTextTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockTextTranslator.java index 8b4fc9dde..3cf121cf9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockTextTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock; +package org.geysermc.geyser.translator.protocol.bedrock; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket; import com.nukkitx.protocol.bedrock.packet.TextPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = TextPacket.class) public class BedrockTextTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/BedrockEntityEventTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/BedrockEntityEventTranslator.java index 21d7f087c..775ec15b5 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/BedrockEntityEventTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity; +package org.geysermc.geyser.translator.protocol.bedrock.entity; import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSelectTradePacket; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.MerchantContainer; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockActionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockActionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java index 89e770f82..711285948 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockActionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.object.Direction; @@ -36,17 +36,17 @@ import com.nukkitx.protocol.bedrock.data.PlayerActionType; import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.*; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.ItemFrameEntity; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.ItemFrameEntity; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.util.BlockUtils; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockEmoteTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockEmoteTranslator.java index 8721c96b0..a4fe12d4e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockEmoteTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.object.Direction; import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket; import com.nukkitx.protocol.bedrock.packet.EmotePacket; import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.BlockUtils; @Translator(packet = EmotePacket.class) public class BedrockEmoteTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java index 5273c1c97..26a25725e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction; @@ -35,12 +35,12 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; import com.nukkitx.protocol.bedrock.packet.InteractPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.InteractiveTagManager; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.entity.InteractiveTagManager; @Translator(packet = InteractPacket.class) public class BedrockInteractTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java index 190b9a2ef..98dd7832c 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket; @@ -33,12 +33,12 @@ import com.nukkitx.math.vector.Vector3d; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; -import org.geysermc.geyser.common.ChatColor; +import org.geysermc.geyser.text.ChatColor; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = MovePlayerPacket.class) public class BedrockMovePlayerTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockRiderJumpTranslator.java similarity index 84% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockRiderJumpTranslator.java index d52c2fc81..79911b5e7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockRiderJumpTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerState; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket; import com.nukkitx.protocol.bedrock.packet.RiderJumpPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = RiderJumpPacket.class) public class BedrockRiderJumpTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java index 80d5f9840..b149f8836 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.entity.player; +package org.geysermc.geyser.translator.protocol.bedrock.entity.player; import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * In vanilla Bedrock, if you have operator status, this sets the player's gamemode without confirmation from the server. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/world/BedrockLevelSoundEventTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/world/BedrockLevelSoundEventTranslator.java index 1b1532ffa..2ac8587bf 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/world/BedrockLevelSoundEventTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.bedrock.world; +package org.geysermc.geyser.translator.protocol.bedrock.world; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.CooldownUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.CooldownUtils; @Translator(packet = LevelSoundEventPacket.class) public class BedrockLevelSoundEventTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaAwardStatsTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaAwardStatsTranslator.java index 2258f6f16..8f4e93635 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaAwardStatsTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundAwardStatsPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.StatisticsUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.StatisticsUtils; @Translator(packet = ClientboundAwardStatsPacket.class) public class JavaAwardStatsTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaBossEventTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaBossEventTranslator.java index 994783f86..2c49baa56 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaBossEventTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.BossBar; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.BossBar; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundBossEventPacket; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChangeDifficultyTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChangeDifficultyTranslator.java index 71f914a75..e0c3a9b95 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChangeDifficultyTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundChangeDifficultyPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import com.nukkitx.protocol.bedrock.packet.SetDifficultyPacket; @Translator(packet = ClientboundChangeDifficultyPacket.class) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChatTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChatTranslator.java index 8e9984124..ca8be2374 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaChatTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundChatPacket; import com.nukkitx.protocol.bedrock.packet.TextPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundChatPacket.class) public class JavaChatTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java index 68ac54302..d0ab68d8f 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.data.game.command.CommandNode; import com.github.steveice10.mc.protocol.data.game.command.CommandParser; @@ -43,13 +43,13 @@ import lombok.Getter; import lombok.ToString; import net.kyori.adventure.text.format.NamedTextColor; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.item.Enchantment; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.inventory.item.Enchantment; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.EntityUtils; +import org.geysermc.geyser.util.EntityUtils; import java.util.*; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomPayloadTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomPayloadTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java index 20a0f46a7..4506cee46 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomPayloadTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCustomPayloadPacket; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCustomPayloadPacket; @@ -31,10 +31,10 @@ import com.google.common.base.Charsets; import com.nukkitx.protocol.bedrock.packet.TransferPacket; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.cumulus.Form; import org.geysermc.cumulus.Forms; import org.geysermc.cumulus.util.FormType; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomQueryTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomQueryTranslator.java index e8a1bb6a7..268b69f45 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomQueryTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundCustomQueryPacket; import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * For the login cycle. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaDisconnectTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaDisconnectTranslator.java index 2d1b83413..e073e6f27 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaDisconnectTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDisconnectPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundDisconnectPacket.class) public class JavaDisconnectTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java index 0458b9dbc..307c27c29 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.skin.SkinManager; @Translator(packet = ClientboundGameProfilePacket.class) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaKeepAliveTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaKeepAliveTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaKeepAliveTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaKeepAliveTranslator.java index 81fee0d3a..680debe49 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaKeepAliveTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaKeepAliveTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundKeepAlivePacket; import com.nukkitx.protocol.bedrock.packet.NetworkStackLatencyPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * Used to forward the keep alive packet to the client in order to get back a reliable ping. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginDisconnectTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginDisconnectTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java index f35cf0e5a..ce5fabe30 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginDisconnectTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundLoginDisconnectPacket.class) public class JavaLoginDisconnectTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java index 8fb5c29e7..855f5b144 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.data.game.entity.player.HandPreference; import com.github.steveice10.mc.protocol.data.game.setting.ChatVisibility; @@ -34,15 +34,15 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCu import com.nukkitx.protocol.bedrock.data.GameRuleData; import com.nukkitx.protocol.bedrock.data.PlayerPermission; import com.nukkitx.protocol.bedrock.packet.*; -import org.geysermc.geyser.common.AuthType; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.BiomeTranslator; -import org.geysermc.geyser.utils.ChunkUtils; -import org.geysermc.geyser.utils.DimensionUtils; -import org.geysermc.geyser.utils.PluginMessageUtils; +import org.geysermc.geyser.session.auth.AuthType; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.level.BiomeTranslator; +import org.geysermc.geyser.util.ChunkUtils; +import org.geysermc.geyser.util.DimensionUtils; +import org.geysermc.geyser.util.PluginMessageUtils; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaPingTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaPingTranslator.java index d71d733cb..a3b2e34b7 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaPingTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundPongPacket; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPingPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; // Why does this packet exist? Whatever, we better implement it @Translator(packet = ClientboundPingPacket.class) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeTranslator.java index 64c82b3fe..0a329f607 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.data.game.UnlockRecipesAction; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRecipePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java index 80484a50f..8f97b1a8d 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRespawnPacket; import com.nukkitx.math.vector.Vector3f; @@ -31,13 +31,13 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.utils.ChunkUtils; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.util.ChunkUtils; +import org.geysermc.geyser.util.DimensionUtils; @Translator(packet = ClientboundRespawnPacket.class) public class JavaRespawnTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSelectAdvancementsTabTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSelectAdvancementsTabTranslator.java index a3606f598..3f82dffb1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSelectAdvancementsTabTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.AdvancementsCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.AdvancementsCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * Indicates that the client should open a particular advancement tab diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateAdvancementsTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateAdvancementsTranslator.java index 3dd9306b8..c1f6f77d2 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateAdvancementsTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java; +package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.data.game.advancement.Advancement; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateAdvancementsPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.session.cache.AdvancementsCache; -import org.geysermc.geyser.utils.GeyserAdvancement; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.session.cache.AdvancementsCache; +import org.geysermc.geyser.level.GeyserAdvancement; +import org.geysermc.geyser.text.MinecraftLocale; import java.util.Map; @@ -89,7 +89,7 @@ public class JavaUpdateAdvancementsTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java index 1e6aad75e..d7fc79f1e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.AnimateEntityPacket; import com.nukkitx.protocol.bedrock.packet.AnimatePacket; import com.nukkitx.protocol.bedrock.packet.SpawnParticleEffectPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.DimensionUtils; @Translator(packet = ClientboundAnimatePacket.class) public class JavaAnimateTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaEntityEventTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaEntityEventTranslator.java index e41232865..1c3239d69 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaEntityEventTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundEntityEventPacket; import com.nukkitx.protocol.bedrock.data.LevelEventType; @@ -32,13 +32,13 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.*; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.FishingHookEntity; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.FishingHookEntity; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.concurrent.ThreadLocalRandom; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosRotTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosRotTranslator.java index b3edb9f52..4f15b0717 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosRotTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosRotPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundMoveEntityPosRotPacket.class) public class JavaMoveEntityPosRotTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosTranslator.java index 710f9b8dd..aeb080465 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityPosTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundMoveEntityPosPacket.class) public class JavaMoveEntityPosTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityRotTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityRotTranslator.java index fa7c7cd47..b2b59480b 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveEntityRotTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityRotPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundMoveEntityRotPacket.class) public class JavaMoveEntityRotTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveVehicleTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveVehicleTranslator.java index 522fdc548..90e121250 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveVehicleTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveVehiclePacket; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundMoveVehiclePacket.class) public class JavaMoveVehicleTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveEntitiesTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveEntitiesTranslator.java index ea21ecd9b..043756db0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveEntitiesTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveEntitiesPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundRemoveEntitiesPacket.class) public class JavaRemoveEntitiesTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveMobEffectTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveMobEffectTranslator.java index 1cab3fac1..bc78bb33e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveMobEffectTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveMobEffectPacket; import com.nukkitx.protocol.bedrock.packet.MobEffectPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.EntityUtils; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.EntityUtils; @Translator(packet = ClientboundRemoveMobEffectPacket.class) public class JavaRemoveMobEffectTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRotateHeadTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRotateHeadTranslator.java index d9595034b..edcad7af6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRotateHeadTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRotateHeadPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundRotateHeadPacket.class) public class JavaRotateHeadTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityDataTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityDataTranslator.java index 37803bffc..987e5fcb2 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityDataTranslator.java @@ -23,20 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; -import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; -import org.geysermc.geyser.entity.EntityMetadataTranslator; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.InteractiveTagManager; - -import java.util.List; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.entity.InteractiveTagManager; @Translator(packet = ClientboundSetEntityDataPacket.class) public class JavaSetEntityDataTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityLinkTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityLinkTranslator.java index aeae1a7e5..88f1c8ae1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityLinkTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityLinkPacket; import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.MobEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.MobEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * Called when a leash is attached, removed or updated from an entity diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityMotionTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityMotionTranslator.java index 886ba0c04..5febe4813 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEntityMotionTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.ItemEntity; -import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.ItemEntity; +import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityMotionPacket; import com.nukkitx.math.vector.Vector3f; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEquipmentTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEquipmentTranslator.java index 3e3ec0e8b..0058ed61e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetEquipmentTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Equipment; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; @Translator(packet = ClientboundSetEquipmentPacket.class) public class JavaSetEquipmentTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetPassengersTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetPassengersTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetPassengersTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetPassengersTranslator.java index 63045f213..f4a6f94ed 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetPassengersTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetPassengersTranslator.java @@ -23,19 +23,19 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetPassengersPacket; import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityLinkData; import com.nukkitx.protocol.bedrock.packet.SetEntityLinkPacket; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.EntityUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.EntityUtils; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTakeItemEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTakeItemEntityTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTakeItemEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTakeItemEntityTranslator.java index b8829e213..75d7bc976 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTakeItemEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTakeItemEntityTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundTakeItemEntityPacket; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import com.nukkitx.protocol.bedrock.packet.TakeItemEntityPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.ExpOrbEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.ExpOrbEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; /** * This packet is called whenever a player picks up an item. diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTeleportEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTeleportEntityTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTeleportEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTeleportEntityTranslator.java index 8949db2f0..cbd994d79 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaTeleportEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaTeleportEntityTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundTeleportEntityPacket; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundTeleportEntityPacket.class) public class JavaTeleportEntityTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateAttributesTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateAttributesTranslator.java index 005150693..c3a4e4ac4 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateAttributesTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateAttributesPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.LivingEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.LivingEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundUpdateAttributesPacket.class) public class JavaUpdateAttributesTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateMobEffectTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateMobEffectTranslator.java index 89d1068cb..2d4161739 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaUpdateMobEffectTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity; +package org.geysermc.geyser.translator.protocol.java.entity; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateMobEffectPacket; import com.nukkitx.protocol.bedrock.packet.MobEffectPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.EntityUtils; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.EntityUtils; @Translator(packet = ClientboundUpdateMobEffectPacket.class) public class JavaUpdateMobEffectTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaBlockBreakAckTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaBlockBreakAckTranslator.java index 732db378b..6fbdb4fc6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaBlockBreakAckTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundBlockBreakAckPacket; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.utils.ChunkUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.util.ChunkUtils; @Translator(packet = ClientboundBlockBreakAckPacket.class) public class JavaBlockBreakAckTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerAbilitiesTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerAbilitiesTranslator.java index dea92355d..98b69a0b8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerAbilitiesTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerAbilitiesPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundPlayerAbilitiesPacket.class) public class JavaPlayerAbilitiesTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoTranslator.java index d9365fffb..252287edc 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.data.game.PlayerListEntry; import com.github.steveice10.mc.protocol.data.game.PlayerListEntryAction; @@ -31,10 +31,10 @@ import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPl import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.PlayerListPacket; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.skin.SkinManager; @Translator(packet = ClientboundPlayerInfoPacket.class) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerPositionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerPositionTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerPositionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerPositionTranslator.java index 682ebef00..3e94321f9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerPositionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerPositionTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.data.game.entity.player.PositionElement; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerPositionPacket; @@ -34,16 +34,16 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityLinkData; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; import com.nukkitx.protocol.bedrock.packet.RespawnPacket; import com.nukkitx.protocol.bedrock.packet.SetEntityLinkPacket; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.TeleportCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.ChunkUtils; -import org.geysermc.geyser.utils.EntityUtils; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.TeleportCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.ChunkUtils; +import org.geysermc.geyser.util.EntityUtils; +import org.geysermc.geyser.text.GeyserLocale; @Translator(packet = ClientboundPlayerPositionPacket.class) public class JavaPlayerPositionTranslator extends PacketTranslator { @@ -84,7 +84,7 @@ public class JavaPlayerPositionTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetExperienceTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetExperienceTranslator.java index db0d92e02..3ac9bf9e3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetExperienceTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetExperiencePacket; import com.nukkitx.protocol.bedrock.data.AttributeData; import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.Arrays; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetHealthTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetHealthTranslator.java index 4e30983c3..8e96ed42e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetHealthTranslator.java @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.player; +package org.geysermc.geyser.translator.protocol.java.entity.player; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket; import com.nukkitx.protocol.bedrock.data.AttributeData; import com.nukkitx.protocol.bedrock.packet.SetHealthPacket; import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.entity.player.SessionPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.List; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddEntityTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddEntityTranslator.java index 9ab1d390c..b80b59ff4 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.spawn; +package org.geysermc.geyser.translator.protocol.java.entity.spawn; import com.github.steveice10.mc.protocol.data.game.entity.object.Direction; import com.github.steveice10.mc.protocol.data.game.entity.object.FallingBlockData; @@ -33,12 +33,16 @@ import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn. import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.entity.*; import org.geysermc.geyser.entity.factory.BaseEntityFactory; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.FallingBlockEntity; +import org.geysermc.geyser.entity.type.FishingHookEntity; +import org.geysermc.geyser.entity.type.ItemFrameEntity; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; @Translator(packet = ClientboundAddEntityPacket.class) public class JavaAddEntityTranslator extends PacketTranslator { @@ -52,7 +56,7 @@ public class JavaAddEntityTranslator extends PacketTranslator definition = Registries.ENTITY_DEFINITIONS.get(packet.getType()); if (definition == null) { - session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType())); + session.getGeyser().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.entity.type_null", packet.getType())); return; } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddExperienceOrbTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddExperienceOrbTranslator.java index ff7eeeb79..33e230c14 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddExperienceOrbTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.spawn; +package org.geysermc.geyser.translator.protocol.java.entity.spawn; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddExperienceOrbPacket; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.ExpOrbEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.ExpOrbEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundAddExperienceOrbPacket.class) public class JavaAddExperienceOrbTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddMobTranslator.java similarity index 84% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddMobTranslator.java index 424be58e8..e6b82f365 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddMobTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.spawn; +package org.geysermc.geyser.translator.protocol.java.entity.spawn; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddMobPacket; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.factory.BaseEntityFactory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; @Translator(packet = ClientboundAddMobPacket.class) public class JavaAddMobTranslator extends PacketTranslator { @@ -46,7 +46,7 @@ public class JavaAddMobTranslator extends PacketTranslator definition = Registries.ENTITY_DEFINITIONS.get(packet.getType()); if (definition == null) { - session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType())); + session.getGeyser().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.entity.type_null", packet.getType())); return; } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPaintingTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPaintingTranslator.java index fe523a032..433d78477 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPaintingTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.spawn; +package org.geysermc.geyser.translator.protocol.java.entity.spawn; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddPaintingPacket; import com.nukkitx.math.vector.Vector3f; -import org.geysermc.geyser.entity.PaintingEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.PaintingType; +import org.geysermc.geyser.entity.type.PaintingEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.PaintingType; @Translator(packet = ClientboundAddPaintingPacket.class) public class JavaAddPaintingTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPlayerTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPlayerTranslator.java index 24d7cb705..74dcaf022 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/spawn/JavaAddPlayerTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.entity.spawn; +package org.geysermc.geyser.translator.protocol.java.entity.spawn; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddPlayerPacket; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.skin.SkinManager; @Translator(packet = ClientboundAddPlayerPacket.class) @@ -52,7 +52,7 @@ public class JavaAddPlayerTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java index dcc6968c5..0d572ca92 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; @Translator(packet = ClientboundContainerSetContentPacket.class) public class JavaContainerSetContentTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetDataTranslator.java similarity index 84% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetDataTranslator.java index d0e767bd1..2ffab0d38 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetDataTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; @Translator(packet = ClientboundContainerSetDataPacket.class) public class JavaContainerSetDataTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java index 9957439af..54cc91ca6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient; @@ -39,14 +39,14 @@ import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.CraftingInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.PlayerInventoryTranslator; -import org.geysermc.geyser.network.translators.item.ItemTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.translator.inventory.CraftingInventoryTranslator; +import org.geysermc.geyser.translator.inventory.PlayerInventoryTranslator; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; +import org.geysermc.geyser.util.InventoryUtils; import java.util.Arrays; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaHorseScreenOpenTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaHorseScreenOpenTranslator.java index 26d836532..4e672bdf9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaHorseScreenOpenTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket; import com.nukkitx.nbt.NbtMap; @@ -31,18 +31,18 @@ import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.nbt.NbtType; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.packet.UpdateEquipPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.animal.horse.ChestedHorseEntity; -import org.geysermc.geyser.entity.living.animal.horse.LlamaEntity; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.animal.horse.ChestedHorseEntity; +import org.geysermc.geyser.entity.type.living.animal.horse.LlamaEntity; import org.geysermc.geyser.inventory.Container; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.horse.DonkeyInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.horse.HorseInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.horse.LlamaInventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.translator.inventory.horse.DonkeyInventoryTranslator; +import org.geysermc.geyser.translator.inventory.horse.HorseInventoryTranslator; +import org.geysermc.geyser.translator.inventory.horse.LlamaInventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaMerchantOffersTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaMerchantOffersTranslator.java index 799f7051a..8f917c1e4 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaMerchantOffersTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade; @@ -35,13 +35,13 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.UpdateTradePacket; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.MerchantContainer; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.item.ItemTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.item.ItemTranslator; import org.geysermc.geyser.registry.type.ItemMapping; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaOpenScreenTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaOpenScreenTranslator.java index bd2f9d3a2..69066eb39 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaOpenScreenTranslator.java @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.inventory; +package org.geysermc.geyser.translator.protocol.java.inventory; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundOpenScreenPacket; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClosePacket; import org.geysermc.geyser.inventory.Inventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.utils.InventoryUtils; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.util.InventoryUtils; +import org.geysermc.geyser.text.MinecraftLocale; @Translator(packet = ClientboundOpenScreenPacket.class) public class JavaOpenScreenTranslator extends PacketTranslator { @@ -58,7 +58,7 @@ public class JavaOpenScreenTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEntityDataTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEntityDataTranslator.java index aa756d094..1c11b298e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEntityDataTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -32,14 +32,14 @@ import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.Clientb import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.inventory.ContainerType; import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator; -import org.geysermc.geyser.network.translators.world.block.entity.RequiresBlockState; -import org.geysermc.geyser.network.translators.world.block.entity.SkullBlockEntityTranslator; -import org.geysermc.geyser.utils.BlockEntityUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.RequiresBlockState; +import org.geysermc.geyser.translator.level.block.entity.SkullBlockEntityTranslator; +import org.geysermc.geyser.util.BlockEntityUtils; @Translator(packet = ClientboundBlockEntityDataPacket.class) public class JavaBlockEntityDataTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEventTranslator.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEventTranslator.java index d4501f7eb..3504168a5 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEventTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.level.block.value.*; @@ -35,14 +35,14 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import com.nukkitx.protocol.bedrock.packet.BlockEventPacket; import it.unimi.dsi.fastutil.objects.Object2IntMaps; import org.geysermc.common.PlatformType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.PistonCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.entity.NoteblockBlockEntityTranslator; -import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntity; -import org.geysermc.geyser.utils.Direction; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.PistonCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.translator.level.block.entity.NoteblockBlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.PistonBlockEntity; +import org.geysermc.geyser.level.physics.Direction; @Translator(packet = ClientboundBlockEventPacket.class) public class JavaBlockEventTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java index aa5a3ac56..298bd4b90 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockUpdatePacket; @@ -31,12 +31,12 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.common.PlatformType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.ChunkUtils; +import org.geysermc.geyser.util.ChunkUtils; @Translator(packet = ClientboundBlockUpdatePacket.class) public class JavaBlockUpdateTranslator extends PacketTranslator { @@ -103,6 +103,6 @@ public class JavaBlockUpdateTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaForgetLevelChunkTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaForgetLevelChunkTranslator.java index f800d77a8..8204ceea5 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaForgetLevelChunkTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundForgetLevelChunkPacket; import com.nukkitx.math.vector.Vector3i; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import java.util.Iterator; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaGameEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaGameEventTranslator.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaGameEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaGameEventTranslator.java index 82adf99cd..642f707a8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaGameEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaGameEventTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.ClientCommand; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -38,12 +38,12 @@ import com.nukkitx.protocol.bedrock.data.GameRuleData; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.packet.*; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.inventory.translators.PlayerInventoryTranslator; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.inventory.PlayerInventoryTranslator; +import org.geysermc.geyser.text.MinecraftLocale; @Translator(packet = ClientboundGameEventPacket.class) public class JavaGameEventTranslator extends PacketTranslator { @@ -152,7 +152,7 @@ public class JavaGameEventTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelEventTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelEventTranslator.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelEventTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelEventTranslator.java index a16b4207c..d861d0338 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelEventTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelEventTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.level.event.BonemealGrowEventData; import com.github.steveice10.mc.protocol.data.game.level.event.BreakBlockEventData; @@ -42,12 +42,12 @@ import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import com.nukkitx.protocol.bedrock.packet.TextPacket; import com.nukkitx.protocol.bedrock.v465.Bedrock_v465; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.event.LevelEventTransformer; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.level.event.LevelEventTranslator; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.LocaleUtils; +import org.geysermc.geyser.text.MinecraftLocale; import java.util.Collections; import java.util.Locale; @@ -82,16 +82,16 @@ public class JavaLevelEventTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSectionBlocksUpdateTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSectionBlocksUpdateTranslator.java index 49c852bcf..c301ee462 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSectionBlocksUpdateTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSectionBlocksUpdatePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.ChunkUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.ChunkUtils; @Translator(packet = ClientboundSectionBlocksUpdatePacket.class) public class JavaSectionBlocksUpdateTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheCenterTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheCenterTranslator.java index a9c0526a8..901a4d82e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheCenterTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheCenterPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.ChunkUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.ChunkUtils; import com.nukkitx.math.vector.Vector3i; @Translator(packet = ClientboundSetChunkCacheCenterPacket.class) diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheRadiusTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheRadiusTranslator.java index f170d430c..50ed540ea 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetChunkCacheRadiusTranslator.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheRadiusPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetChunkCacheRadiusPacket.class) public class JavaSetChunkCacheRadiusTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetDefaultSpawnPositionTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetDefaultSpawnPositionTranslator.java index fbae567fc..8067341e1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetDefaultSpawnPositionTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetDefaultSpawnPositionPacket; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.SetSpawnPositionPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.utils.DimensionUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.util.DimensionUtils; @Translator(packet = ClientboundSetDefaultSpawnPositionPacket.class) public class JavaSetDefaultSpawnPositionTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetTimeTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetTimeTranslator.java index 62ee60d2d..9ff6965ca 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSetTimeTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket; import com.nukkitx.protocol.bedrock.packet.SetTimePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetTimePacket.class) public class JavaSetTimeTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSoundTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSoundTranslator.java index 7e6d1f979..e9f9337aa 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSoundTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSoundPacket; import com.nukkitx.math.vector.Vector3f; @@ -31,12 +31,12 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.utils.SoundUtils; +import org.geysermc.geyser.util.SoundUtils; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.SoundMapping; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaStopSoundTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaStopSoundTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaStopSoundTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaStopSoundTranslator.java index 283309165..75a99f0af 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaStopSoundTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaStopSoundTranslator.java @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level; +package org.geysermc.geyser.translator.protocol.java.level; import com.github.steveice10.mc.protocol.data.game.level.sound.BuiltinSound; import com.github.steveice10.mc.protocol.data.game.level.sound.CustomSound; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundStopSoundPacket; import com.nukkitx.protocol.bedrock.packet.StopSoundPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.SoundMapping; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaInitializeBorderTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaInitializeBorderTranslator.java index 5f1bc1585..1f7ea7657 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaInitializeBorderTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundInitializeBorderPacket; import com.nukkitx.math.vector.Vector2d; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundInitializeBorderPacket.class) public class JavaInitializeBorderTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderCenterTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderCenterTranslator.java index 4051382f4..6895cf944 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderCenterTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderCenterPacket; import com.nukkitx.math.vector.Vector2d; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetBorderCenterPacket.class) public class JavaSetBorderCenterTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderLerpSizeTranslator.java similarity index 86% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderLerpSizeTranslator.java index 7d068b031..3eae4b1f5 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderLerpSizeTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderLerpSizePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetBorderLerpSizePacket.class) public class JavaSetBorderLerpSizeTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderSizeTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderSizeTranslator.java index 12f93d5cc..076924735 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderSizeTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderSizePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetBorderSizePacket.class) public class JavaSetBorderSizeTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDelayTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDelayTranslator.java index 9e5b75df1..b3104fb9a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDelayTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDelayPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetBorderWarningDelayPacket.class) public class JavaSetBorderWarningDelayTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDistanceTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDistanceTranslator.java index b3dbc083b..b4483b9a6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/border/JavaSetBorderWarningDistanceTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.level.border; +package org.geysermc.geyser.translator.protocol.java.level.border; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDistancePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldBorder; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldBorder; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetBorderWarningDistancePacket.class) public class JavaSetBorderWarningDistanceTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetDisplayObjectiveTranslator.java similarity index 88% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetDisplayObjectiveTranslator.java index ac150d3a1..fe141486e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetDisplayObjectiveTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.scoreboard; +package org.geysermc.geyser.translator.protocol.java.scoreboard; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetDisplayObjectivePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.scoreboard.Scoreboard; import org.geysermc.geyser.scoreboard.ScoreboardUpdater; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetObjectiveTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetObjectiveTranslator.java index 77969cf84..927fb5488 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetObjectiveTranslator.java @@ -23,19 +23,19 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.scoreboard; +package org.geysermc.geyser.translator.protocol.java.scoreboard; import com.github.steveice10.mc.protocol.data.game.scoreboard.ObjectiveAction; import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetObjectivePacket; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.scoreboard.Objective; import org.geysermc.geyser.scoreboard.Scoreboard; import org.geysermc.geyser.scoreboard.ScoreboardUpdater; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetPlayerTeamTranslator.java similarity index 95% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetPlayerTeamTranslator.java index 00b8c76cb..fa5bd10e1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetPlayerTeamTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.scoreboard; +package org.geysermc.geyser.translator.protocol.java.scoreboard; import com.github.steveice10.mc.protocol.data.game.scoreboard.NameTagVisibility; import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamAction; @@ -31,10 +31,10 @@ import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.geysermc.geyser.scoreboard.Scoreboard; import org.geysermc.geyser.scoreboard.ScoreboardUpdater; import org.geysermc.geyser.scoreboard.Team; diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetScoreTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetScoreTranslator.java index 4216a34dd..111ec4538 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetScoreTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.scoreboard; +package org.geysermc.geyser.translator.protocol.java.scoreboard; import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardAction; import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition; @@ -32,15 +32,15 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.entity.player.PlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.WorldCache; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.entity.type.player.PlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.WorldCache; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.scoreboard.Objective; import org.geysermc.geyser.scoreboard.Scoreboard; import org.geysermc.geyser.scoreboard.ScoreboardUpdater; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.text.GeyserLocale; @Translator(packet = ClientboundSetScorePacket.class) public class JavaSetScoreTranslator extends PacketTranslator { @@ -58,7 +58,7 @@ public class JavaSetScoreTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java index b5e5806f7..914ddafb9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.title; +package org.geysermc.geyser.translator.protocol.java.title; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetActionBarTextPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundSetActionBarTextPacket.class) public class JavaSetActionBarTextTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetSubtitleTextTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetSubtitleTextTranslator.java index 4865a4e00..521f5eba6 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetSubtitleTextTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.title; +package org.geysermc.geyser.translator.protocol.java.title; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetSubtitleTextPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundSetSubtitleTextPacket.class) public class JavaSetSubtitleTextTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitleTextTranslator.java similarity index 87% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitleTextTranslator.java index 8d54ac704..04eb76bb5 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitleTextTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.title; +package org.geysermc.geyser.translator.protocol.java.title; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitleTextPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; -import org.geysermc.geyser.network.translators.chat.MessageTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; +import org.geysermc.geyser.translator.text.MessageTranslator; @Translator(packet = ClientboundSetTitleTextPacket.class) public class JavaSetTitleTextTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitlesAnimationTranslator.java similarity index 89% rename from core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitlesAnimationTranslator.java index e00a61db9..b8bbc780a 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetTitlesAnimationTranslator.java @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.java.title; +package org.geysermc.geyser.translator.protocol.java.title; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitlesAnimationPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.PacketTranslator; -import org.geysermc.geyser.network.translators.Translator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = ClientboundSetTitlesAnimationPacket.class) public class JavaSetTitlesAnimationTranslator extends PacketTranslator { diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/BlockSoundInteractionTranslator.java similarity index 90% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/BlockSoundInteractionTranslator.java index 7fbc5d6f4..5e6e8d9e8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/BlockSoundInteractionTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound; +package org.geysermc.geyser.translator.sound; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -32,16 +32,16 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.Tag; import com.nukkitx.math.vector.Vector3f; import org.geysermc.geyser.inventory.GeyserItemStack; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.utils.BlockUtils; +import org.geysermc.geyser.util.BlockUtils; import java.util.Map; /** * Sound interaction handler for when a block is right-clicked. */ -public interface BlockSoundInteractionHandler extends SoundInteractionHandler { +public interface BlockSoundInteractionTranslator extends SoundInteractionTranslator { /** * Handles the block interaction when a player @@ -55,8 +55,8 @@ public interface BlockSoundInteractionHandler extends SoundInteractionHandler> interactionEntry : Registries.SOUND_HANDLERS.get().entrySet()) { - if (!(interactionEntry.getValue() instanceof BlockSoundInteractionHandler)) { + for (Map.Entry> interactionEntry : Registries.SOUND_TRANSLATORS.get().entrySet()) { + if (!(interactionEntry.getValue() instanceof BlockSoundInteractionTranslator)) { continue; } if (interactionEntry.getKey().blocks().length != 0) { @@ -91,7 +91,7 @@ public interface BlockSoundInteractionHandler extends SoundInteractionHandler { +public interface EntitySoundInteractionTranslator extends SoundInteractionTranslator { /** * Handles the block interaction when a player @@ -50,8 +50,8 @@ public interface EntitySoundInteractionHandler extends SoundInteractionHandler> interactionEntry : Registries.SOUND_HANDLERS.get().entrySet()) { - if (!(interactionEntry.getValue() instanceof EntitySoundInteractionHandler)) { + for (Map.Entry> interactionEntry : Registries.SOUND_TRANSLATORS.get().entrySet()) { + if (!(interactionEntry.getValue() instanceof EntitySoundInteractionTranslator)) { continue; } if (interactionEntry.getKey().entities().length != 0) { @@ -87,7 +87,7 @@ public interface EntitySoundInteractionHandler extends SoundInteractionHandler the value */ -public interface SoundInteractionHandler { +public interface SoundInteractionTranslator { /** * Handles the interaction when a player @@ -48,5 +48,5 @@ public interface SoundInteractionHandler { * @param position the position of the block * @param value the value */ - void handleInteraction(GeyserSession session, Vector3f position, T value); + void translate(GeyserSession session, Vector3f position, T value); } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/SoundTranslator.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/SoundTranslator.java index def77300d..be8257993 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/SoundTranslator.java @@ -23,24 +23,24 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound; +package org.geysermc.geyser.translator.sound; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** * Marks if a class should be handled as a - * {@link SoundInteractionHandler}. + * {@link SoundInteractionTranslator}. */ @Retention(value = RetentionPolicy.RUNTIME) -public @interface SoundHandler { +public @interface SoundTranslator { /** * The identifier(s) that the placed block must contain * one of. Leave empty to ignore. * * Only applies to interaction handlers that are an - * instance of {@link BlockSoundInteractionHandler}. + * instance of {@link BlockSoundInteractionTranslator}. * * @return the value the interacted block must contain */ @@ -59,7 +59,7 @@ public @interface SoundHandler { * Leave empty to ignore. * * Only applies to interaction handlers that are an - * instance of {@link EntitySoundInteractionHandler}. + * instance of {@link EntitySoundInteractionTranslator}. * * @return the value the item in the player's hand must contain */ diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/BucketSoundInteractionTranslator.java similarity index 85% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/BucketSoundInteractionTranslator.java index 7e3148e38..1af30e658 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/BucketSoundInteractionTranslator.java @@ -23,27 +23,27 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.geyser.inventory.GeyserItemStack; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(items = "bucket", ignoreSneakingWhileHolding = true) -public class BucketSoundInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(items = "bucket", ignoreSneakingWhileHolding = true) +public class BucketSoundInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { if (session.getBucketScheduledFuture() == null) { return; // No bucket was really interacted with } GeyserItemStack itemStack = session.getPlayerInventory().getItemInHand(); String handItemIdentifier = itemStack.getMapping(session).getJavaIdentifier(); - if (!BlockSoundInteractionHandler.canInteract(session, itemStack, identifier)) { + if (!BlockSoundInteractionTranslator.canInteract(session, itemStack, identifier)) { return; } LevelSoundEventPacket soundEventPacket = new LevelSoundEventPacket(); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/ComparatorSoundInteractionTranslator.java similarity index 78% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/ComparatorSoundInteractionTranslator.java index 31c18d2b3..8c10076d3 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/ComparatorSoundInteractionTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(blocks = "comparator") -public class ComparatorSoundInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(blocks = "comparator") +public class ComparatorSoundInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { boolean powered = identifier.contains("mode=compare"); LevelEventPacket levelEventPacket = new LevelEventPacket(); levelEventPacket.setPosition(position); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/DoorSoundInteractionTranslator.java similarity index 77% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/DoorSoundInteractionTranslator.java index 952bf18ae..1115760eb 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/DoorSoundInteractionTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(blocks = {"door", "fence_gate"}) -public class DoorSoundInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(blocks = {"door", "fence_gate"}) +public class DoorSoundInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { if (identifier.contains("iron")) return; LevelEventPacket levelEventPacket = new LevelEventPacket(); levelEventPacket.setType(LevelEventType.SOUND_DOOR_OPEN); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/FlintAndSteelInteractionTranslator.java similarity index 77% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/FlintAndSteelInteractionTranslator.java index 59d12d202..09e86f461 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/FlintAndSteelInteractionTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(items = "flint_and_steel", ignoreSneakingWhileHolding = true) -public class FlintAndSteelInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(items = "flint_and_steel", ignoreSneakingWhileHolding = true) +public class FlintAndSteelInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { LevelSoundEventPacket levelSoundEventPacket = new LevelSoundEventPacket(); levelSoundEventPacket.setPosition(position); levelSoundEventPacket.setBabySound(false); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/GrassPathInteractionTranslator.java similarity index 79% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/GrassPathInteractionTranslator.java index 7cfbc7813..6c91b24a0 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/GrassPathInteractionTranslator.java @@ -23,21 +23,21 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; import org.geysermc.geyser.registry.BlockRegistries; -@SoundHandler(blocks = "farmland", items = "hoe", ignoreSneakingWhileHolding = true) -public class HoeInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(blocks = "grass_path", items = "shovel", ignoreSneakingWhileHolding = true) +public class GrassPathInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { LevelSoundEventPacket levelSoundEventPacket = new LevelSoundEventPacket(); levelSoundEventPacket.setPosition(position); levelSoundEventPacket.setBabySound(false); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/HoeInteractionTranslator.java similarity index 78% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/HoeInteractionTranslator.java index b9f838e14..799364498 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/HoeInteractionTranslator.java @@ -23,21 +23,21 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; import org.geysermc.geyser.registry.BlockRegistries; -@SoundHandler(blocks = "grass_path", items = "shovel", ignoreSneakingWhileHolding = true) -public class GrassPathInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(blocks = "farmland", items = "hoe", ignoreSneakingWhileHolding = true) +public class HoeInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { LevelSoundEventPacket levelSoundEventPacket = new LevelSoundEventPacket(); levelSoundEventPacket.setPosition(position); levelSoundEventPacket.setBabySound(false); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/block/LeverSoundInteractionTranslator.java similarity index 78% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/block/LeverSoundInteractionTranslator.java index 5cfaac2ec..a57d337b1 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/block/LeverSoundInteractionTranslator.java @@ -23,20 +23,20 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.block; +package org.geysermc.geyser.translator.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.BlockSoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(blocks = "lever") -public class LeverSoundInteractionHandler implements BlockSoundInteractionHandler { +@SoundTranslator(blocks = "lever") +public class LeverSoundInteractionTranslator implements BlockSoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + public void translate(GeyserSession session, Vector3f position, String identifier) { boolean powered = identifier.contains("powered=true"); LevelEventPacket levelEventPacket = new LevelEventPacket(); levelEventPacket.setPosition(position); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/entity/FeedBabySoundInteractionTranslator.java similarity index 75% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/entity/FeedBabySoundInteractionTranslator.java index fa4c1a48f..ea160538e 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/entity/FeedBabySoundInteractionTranslator.java @@ -23,24 +23,24 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.entity; +package org.geysermc.geyser.translator.sound.entity; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityEventType; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.animal.AnimalEntity; -import org.geysermc.geyser.entity.living.animal.OcelotEntity; -import org.geysermc.geyser.entity.living.animal.tameable.CatEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.animal.AnimalEntity; +import org.geysermc.geyser.entity.type.living.animal.OcelotEntity; +import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.EntitySoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler -public class FeedBabySoundInteractionHandler implements EntitySoundInteractionHandler { +@SoundTranslator +public class FeedBabySoundInteractionTranslator implements EntitySoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, Entity entity) { + public void translate(GeyserSession session, Vector3f position, Entity entity) { if (entity instanceof AnimalEntity animalEntity && !(entity instanceof CatEntity || entity instanceof OcelotEntity)) { String handIdentifier = session.getPlayerInventory().getItemInHand().getMapping(session).getJavaIdentifier(); boolean isBaby = animalEntity.isBaby(); diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/translator/sound/entity/MilkEntitySoundInteractionTranslator.java similarity index 79% rename from core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java rename to core/src/main/java/org/geysermc/geyser/translator/sound/entity/MilkEntitySoundInteractionTranslator.java index eb6060378..e8698ff23 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java +++ b/core/src/main/java/org/geysermc/geyser/translator/sound/entity/MilkEntitySoundInteractionTranslator.java @@ -23,23 +23,23 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.sound.entity; +package org.geysermc.geyser.translator.sound.entity; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.entity.living.animal.GoatEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler; -import org.geysermc.geyser.network.translators.sound.SoundHandler; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.entity.type.living.animal.GoatEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.sound.EntitySoundInteractionTranslator; +import org.geysermc.geyser.translator.sound.SoundTranslator; -@SoundHandler(entities = {"cow", "goat"}, items = "bucket") -public class MilkEntitySoundInteractionHandler implements EntitySoundInteractionHandler { +@SoundTranslator(entities = {"cow", "goat"}, items = "bucket") +public class MilkEntitySoundInteractionTranslator implements EntitySoundInteractionTranslator { @Override - public void handleInteraction(GeyserSession session, Vector3f position, Entity value) { + public void translate(GeyserSession session, Vector3f position, Entity value) { if (!session.getPlayerInventory().getItemInHand().getMapping(session).getJavaIdentifier().equals("minecraft:bucket")) { return; } diff --git a/core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java rename to core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java index 4b03d4b20..d22b47768 100644 --- a/core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.network.translators.chat; +package org.geysermc.geyser.translator.text; import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer; import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor; @@ -33,8 +33,10 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.utils.LanguageUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.MinecraftTranslationRegistry; +import org.geysermc.geyser.text.GsonComponentSerializerWrapper; +import org.geysermc.geyser.text.GeyserLocale; import java.util.EnumMap; import java.util.Map; @@ -131,11 +133,11 @@ public class MessageTranslator { } public static String convertMessage(String message) { - return convertMessage(message, LanguageUtils.getDefaultLocale()); + return convertMessage(message, GeyserLocale.getDefaultLocale()); } public static String convertMessage(Component message) { - return convertMessage(message, LanguageUtils.getDefaultLocale()); + return convertMessage(message, GeyserLocale.getDefaultLocale()); } /** @@ -166,7 +168,7 @@ public class MessageTranslator { } public static String convertMessageLenient(String message) { - return convertMessageLenient(message, LanguageUtils.getDefaultLocale()); + return convertMessageLenient(message, GeyserLocale.getDefaultLocale()); } /** @@ -226,7 +228,7 @@ public class MessageTranslator { */ public static boolean isTooLong(String message, GeyserSession session) { if (message.length() > 256) { - session.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.chat.too_long", session.getLocale(), message.length())); + session.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.chat.too_long", session.getLocale(), message.length())); return true; } diff --git a/core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java b/core/src/main/java/org/geysermc/geyser/util/AttributeUtils.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java rename to core/src/main/java/org/geysermc/geyser/util/AttributeUtils.java index f83d87c52..56ef71f91 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/AttributeUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute; import com.github.steveice10.mc.protocol.data.game.entity.attribute.AttributeModifier; diff --git a/core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java b/core/src/main/java/org/geysermc/geyser/util/BlockEntityUtils.java similarity index 92% rename from core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java rename to core/src/main/java/org/geysermc/geyser/util/BlockEntityUtils.java index 78c9860f5..6d4258d7e 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/BlockEntityUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; @@ -31,10 +31,10 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.entity.BedrockOnlyBlockEntity; -import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator; -import org.geysermc.geyser.network.translators.world.block.entity.FlowerPotBlockEntityTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.level.block.entity.BedrockOnlyBlockEntity; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.FlowerPotBlockEntityTranslator; import org.geysermc.geyser.registry.Registries; import javax.annotation.Nonnull; diff --git a/core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java b/core/src/main/java/org/geysermc/geyser/util/BlockUtils.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java rename to core/src/main/java/org/geysermc/geyser/util/BlockUtils.java index fc66abd05..c43cc3311 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/BlockUtils.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.math.vector.Vector3i; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.collision.translators.BlockCollision; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.BlockMapping; import org.geysermc.geyser.registry.type.ItemMapping; diff --git a/core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java b/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java similarity index 93% rename from core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java rename to core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java index 650faccc1..cb80e209b 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -38,17 +38,18 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.ints.IntLists; import lombok.experimental.UtilityClass; -import org.geysermc.geyser.entity.ItemFrameEntity; -import org.geysermc.geyser.entity.player.SkullPlayerEntity; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.block.BlockStateValues; -import org.geysermc.geyser.network.translators.world.block.entity.BedrockOnlyBlockEntity; -import org.geysermc.geyser.network.translators.world.chunk.BlockStorage; -import org.geysermc.geyser.network.translators.world.chunk.GeyserChunkSection; -import org.geysermc.geyser.network.translators.world.chunk.bitarray.SingletonBitArray; +import org.geysermc.geyser.entity.type.ItemFrameEntity; +import org.geysermc.geyser.entity.type.player.SkullPlayerEntity; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.block.BlockStateValues; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.translator.level.block.entity.BedrockOnlyBlockEntity; +import org.geysermc.geyser.level.chunk.BlockStorage; +import org.geysermc.geyser.level.chunk.GeyserChunkSection; +import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray; import org.geysermc.geyser.registry.BlockRegistries; -import static org.geysermc.geyser.network.translators.world.block.BlockStateValues.JAVA_AIR_ID; +import static org.geysermc.geyser.level.block.BlockStateValues.JAVA_AIR_ID; @UtilityClass public class ChunkUtils { @@ -253,7 +254,7 @@ public class ChunkUtils { // The constraints change depending on if the player is in the overworld or not, and if experimental height is enabled if (minY < (extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT) || maxY > (extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT)) { - session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.translator.chunk.out_of_bounds", + session.getGeyser().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.translator.chunk.out_of_bounds", extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT, extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT, session.getDimension())); diff --git a/core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java b/core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java rename to core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java index 8f72fafd8..c149996b8 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; import lombok.Getter; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.cache.PreferencesCache; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.cache.PreferencesCache; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java rename to core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java index 974fdb2c7..c729c0b1e 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.Effect; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -33,8 +33,8 @@ import com.nukkitx.protocol.bedrock.packet.ChangeDimensionPacket; import com.nukkitx.protocol.bedrock.packet.MobEffectPacket; import com.nukkitx.protocol.bedrock.packet.StopSoundPacket; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.entity.Entity; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.entity.type.Entity; +import org.geysermc.geyser.session.GeyserSession; import java.util.Set; diff --git a/core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java b/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java rename to core/src/main/java/org/geysermc/geyser/util/EntityUtils.java index 96a94a966..224a617b6 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.Effect; import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import org.geysermc.geyser.entity.Entity; +import org.geysermc.geyser.entity.type.Entity; import org.geysermc.geyser.entity.EntityDefinitions; -import org.geysermc.geyser.entity.living.ArmorStandEntity; -import org.geysermc.geyser.entity.living.animal.AnimalEntity; +import org.geysermc.geyser.entity.type.living.ArmorStandEntity; +import org.geysermc.geyser.entity.type.living.animal.AnimalEntity; import java.util.Locale; diff --git a/core/src/main/java/org/geysermc/geyser/utils/FileUtils.java b/core/src/main/java/org/geysermc/geyser/util/FileUtils.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/FileUtils.java rename to core/src/main/java/org/geysermc/geyser/util/FileUtils.java index 7d8029848..0671c5df7 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/FileUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/FileUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java b/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java rename to core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java index 89b5657f6..1b671b2fe 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -37,15 +37,16 @@ import com.nukkitx.protocol.bedrock.data.inventory.ContainerId; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import com.nukkitx.protocol.bedrock.packet.PlayerHotbarPacket; -import org.geysermc.geyser.common.ChatColor; import org.geysermc.geyser.inventory.Container; import org.geysermc.geyser.inventory.GeyserItemStack; import org.geysermc.geyser.inventory.Inventory; import org.geysermc.geyser.inventory.PlayerInventory; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.InventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator; -import org.geysermc.geyser.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.translator.inventory.InventoryTranslator; +import org.geysermc.geyser.translator.inventory.LecternInventoryTranslator; +import org.geysermc.geyser.translator.inventory.chest.DoubleChestInventoryTranslator; import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.type.ItemMapping; @@ -165,7 +166,7 @@ public class InventoryUtils { NbtMapBuilder display = NbtMap.builder(); // Not ideal to use log here but we dont get a session - display.putString("Name", ChatColor.RESET + LanguageUtils.getLocaleStringLog("geyser.inventory.unusable_item.name")); + display.putString("Name", ChatColor.RESET + GeyserLocale.getLocaleStringLog("geyser.inventory.unusable_item.name")); display.putList("Lore", NbtType.STRING, Collections.singletonList(ChatColor.RESET + ChatColor.DARK_PURPLE + description)); root.put("display", display.build()); diff --git a/core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java b/core/src/main/java/org/geysermc/geyser/util/ItemUtils.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java rename to core/src/main/java/org/geysermc/geyser/util/ItemUtils.java index c24c40ecf..0eed01613 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/ItemUtils.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.opennbt.tag.builtin.*; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; public class ItemUtils { diff --git a/core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java b/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java rename to core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java index 1b23f0cba..213953bdd 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -39,15 +39,16 @@ import com.nukkitx.protocol.bedrock.packet.ServerToClientHandshakePacket; import com.nukkitx.protocol.bedrock.util.EncryptionUtils; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.session.auth.AuthData; -import org.geysermc.geyser.network.session.auth.BedrockClientData; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.auth.AuthData; +import org.geysermc.geyser.session.auth.BedrockClientData; import org.geysermc.cumulus.CustomForm; import org.geysermc.cumulus.ModalForm; import org.geysermc.cumulus.SimpleForm; import org.geysermc.cumulus.response.CustomFormResponse; import org.geysermc.cumulus.response.ModalFormResponse; import org.geysermc.cumulus.response.SimpleFormResponse; +import org.geysermc.geyser.text.GeyserLocale; import javax.crypto.SecretKey; import java.io.IOException; @@ -139,7 +140,7 @@ public class LoginEncryptionUtils { geyser.getLogger().debug(String.format("Is player data valid? %s", validChain)); if (!validChain && !session.getGeyser().getConfig().isEnableProxyConnections()) { - session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.remote.invalid_xbox_account")); + session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.remote.invalid_xbox_account")); return; } JWSObject jwt = JWSObject.parse(certChainData.get(certChainData.size() - 1).asText()); @@ -205,8 +206,8 @@ public class LoginEncryptionUtils { private static void sendEncryptionFailedMessage(GeyserImpl geyser) { if (!HAS_SENT_ENCRYPTION_MESSAGE) { - geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_1")); - geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_2", "https://geysermc.org/supported_java")); + geyser.getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.encryption.line_1")); + geyser.getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.encryption.line_2", "https://geysermc.org/supported_java")); HAS_SENT_ENCRYPTION_MESSAGE = true; } } @@ -220,7 +221,7 @@ public class LoginEncryptionUtils { session.sendForm( SimpleForm.builder() - .translator(LanguageUtils::getPlayerLocaleString, session.getLocale()) + .translator(GeyserLocale::getPlayerLocaleString, session.getLocale()) .title("geyser.auth.login.form.notice.title") .content("geyser.auth.login.form.notice.desc") .optionalButton("geyser.auth.login.form.notice.btn_login.mojang", isPasswordAuthEnabled) @@ -251,14 +252,14 @@ public class LoginEncryptionUtils { return; } - session.disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); + session.disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); })); } public static void buildAndShowLoginDetailsWindow(GeyserSession session) { session.sendForm( CustomForm.builder() - .translator(LanguageUtils::getPlayerLocaleString, session.getLocale()) + .translator(GeyserLocale::getPlayerLocaleString, session.getLocale()) .title("geyser.auth.login.form.details.title") .label("geyser.auth.login.form.details.desc") .input("geyser.auth.login.form.details.email", "account@geysermc.org", "") @@ -280,7 +281,7 @@ public class LoginEncryptionUtils { public static void buildAndShowMicrosoftAuthenticationWindow(GeyserSession session) { session.sendForm( SimpleForm.builder() - .translator(LanguageUtils::getPlayerLocaleString, session.getLocale()) + .translator(GeyserLocale::getPlayerLocaleString, session.getLocale()) .title("geyser.auth.login.form.notice.btn_login.microsoft") .button("geyser.auth.login.method.browser") .button("geyser.auth.login.method.password") @@ -297,7 +298,7 @@ public class LoginEncryptionUtils { } else if (response.getClickedButtonId() == 1) { buildAndShowLoginDetailsWindow(session); } else { - session.disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); + session.disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); } })); } @@ -320,7 +321,7 @@ public class LoginEncryptionUtils { } if (response.getClickedButtonId() == 1) { - session.disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); + session.disconnect(GeyserLocale.getPlayerLocaleString("geyser.auth.login.form.disconnect", session.getLocale())); } }) ); diff --git a/core/src/main/java/org/geysermc/geyser/utils/MathUtils.java b/core/src/main/java/org/geysermc/geyser/util/MathUtils.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/MathUtils.java rename to core/src/main/java/org/geysermc/geyser/util/MathUtils.java index ef638a5cd..7619c7906 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/MathUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/MathUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; public class MathUtils { diff --git a/core/src/main/java/org/geysermc/geyser/metrics/Metrics.java b/core/src/main/java/org/geysermc/geyser/util/Metrics.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/metrics/Metrics.java rename to core/src/main/java/org/geysermc/geyser/util/Metrics.java index bc69cd65d..37d3f81eb 100644 --- a/core/src/main/java/org/geysermc/geyser/metrics/Metrics.java +++ b/core/src/main/java/org/geysermc/geyser/util/Metrics.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.metrics; +package org.geysermc.geyser.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java b/core/src/main/java/org/geysermc/geyser/util/NewsHandler.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java rename to core/src/main/java/org/geysermc/geyser/util/NewsHandler.java index 5ff743630..ff0080f74 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java +++ b/core/src/main/java/org/geysermc/geyser/util/NewsHandler.java @@ -23,21 +23,22 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonSyntaxException; +import org.geysermc.geyser.Constants; import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.api.logger.GeyserLogger; -import org.geysermc.geyser.common.ChatColor; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.floodgate.news.NewsItem; import org.geysermc.floodgate.news.NewsItemAction; import org.geysermc.floodgate.news.data.AnnouncementData; import org.geysermc.floodgate.news.data.BuildSpecificData; import org.geysermc.floodgate.news.data.CheckAfterData; +import org.geysermc.geyser.text.ChatColor; import java.util.*; import java.util.concurrent.Executors; diff --git a/core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java b/core/src/main/java/org/geysermc/geyser/util/PluginMessageUtils.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java rename to core/src/main/java/org/geysermc/geyser/util/PluginMessageUtils.java index a2d5b98f7..ed706eeca 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/PluginMessageUtils.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCustomPayloadPacket; import com.google.common.base.Charsets; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import java.nio.ByteBuffer; diff --git a/core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java b/core/src/main/java/org/geysermc/geyser/util/SettingsUtils.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java rename to core/src/main/java/org/geysermc/geyser/util/SettingsUtils.java index c79c84735..28fb53ab1 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/SettingsUtils.java @@ -23,16 +23,19 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.data.game.setting.Difficulty; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.world.WorldManager; +import org.geysermc.geyser.level.GameRule; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.WorldManager; import org.geysermc.cumulus.CustomForm; import org.geysermc.cumulus.component.DropdownComponent; import org.geysermc.cumulus.response.CustomFormResponse; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.text.MinecraftLocale; public class SettingsUtils { /** @@ -95,7 +98,7 @@ public class SettingsUtils { boolean showGamerules = session.getOpPermissionLevel() >= 2 || session.hasPermission("geyser.settings.gamerules"); if (showGamerules) { builder.label("geyser.settings.title.game_rules") - .translator(LocaleUtils::getLocaleString); // we need translate gamerules next + .translator(MinecraftLocale::getLocaleString); // we need translate gamerules next WorldManager worldManager = GeyserImpl.getInstance().getWorldManager(); for (GameRule gamerule : GameRule.values()) { @@ -173,8 +176,8 @@ public class SettingsUtils { private static String translateEntry(String key, String locale) { if (key.startsWith("geyser.")) { - return LanguageUtils.getPlayerLocaleString(key, locale); + return GeyserLocale.getPlayerLocaleString(key, locale); } - return LocaleUtils.getLocaleString(key, locale); + return MinecraftLocale.getLocaleString(key, locale); } } diff --git a/core/src/main/java/org/geysermc/geyser/utils/SignUtils.java b/core/src/main/java/org/geysermc/geyser/util/SignUtils.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/SignUtils.java rename to core/src/main/java/org/geysermc/geyser/util/SignUtils.java index 5cb9182c9..3d3c23f7d 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/SignUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/SignUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; /** * Provides utilities for interacting with signs. Mainly, it deals with the widths of each character. diff --git a/core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java b/core/src/main/java/org/geysermc/geyser/util/SoundUtils.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java rename to core/src/main/java/org/geysermc/geyser/util/SoundUtils.java index 79aaf94e4..6c4697a8b 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/SoundUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.nukkitx.protocol.bedrock.data.SoundEvent; diff --git a/core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java b/core/src/main/java/org/geysermc/geyser/util/StatisticsUtils.java similarity index 96% rename from core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java rename to core/src/main/java/org/geysermc/geyser/util/StatisticsUtils.java index da7bf4705..aa5893462 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/StatisticsUtils.java @@ -23,17 +23,19 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.github.steveice10.mc.protocol.data.MagicValues; import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.github.steveice10.mc.protocol.data.game.statistic.*; -import org.geysermc.geyser.network.session.GeyserSession; +import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.type.ItemMappings; import org.geysermc.cumulus.SimpleForm; import org.geysermc.cumulus.response.SimpleFormResponse; import org.geysermc.cumulus.util.FormImage; +import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.text.MinecraftLocale; import java.util.Map; import java.util.regex.Matcher; @@ -199,10 +201,10 @@ public class StatisticsUtils { */ private static String getItemTranslateKey(String item, String language) { item = item.replace("minecraft:", "item.minecraft."); - String translatedItem = LocaleUtils.getLocaleString(item, language); + String translatedItem = MinecraftLocale.getLocaleString(item, language); if (translatedItem.equals(item)) { // Didn't translate; must be a block - translatedItem = LocaleUtils.getLocaleString(item.replace("item.", "block."), language); + translatedItem = MinecraftLocale.getLocaleString(item.replace("item.", "block."), language); } return translatedItem; } @@ -229,8 +231,8 @@ public class StatisticsUtils { private static String translateEntry(String key, String locale) { if (key.startsWith("geyser.")) { - return LanguageUtils.getPlayerLocaleString(key, locale); + return GeyserLocale.getPlayerLocaleString(key, locale); } - return LocaleUtils.getLocaleString(key, locale); + return MinecraftLocale.getLocaleString(key, locale); } } diff --git a/core/src/main/java/org/geysermc/geyser/utils/WebUtils.java b/core/src/main/java/org/geysermc/geyser/util/WebUtils.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/WebUtils.java rename to core/src/main/java/org/geysermc/geyser/util/WebUtils.java index 52e1783d5..a70971cb2 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/WebUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/WebUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils; +package org.geysermc.geyser.util; import com.fasterxml.jackson.databind.JsonNode; import org.geysermc.geyser.GeyserImpl; diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2BooleanMap.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java rename to core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2BooleanMap.java index f28614597..ba30da927 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2BooleanMap.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import it.unimi.dsi.fastutil.ints.AbstractInt2BooleanMap; import it.unimi.dsi.fastutil.objects.ObjectSet; diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2ByteMap.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java rename to core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2ByteMap.java index 6917ccf51..65deeaca6 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2ByteMap.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import it.unimi.dsi.fastutil.ints.AbstractInt2ByteMap; import it.unimi.dsi.fastutil.ints.Int2ByteMap; diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2IntMap.java similarity index 98% rename from core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java rename to core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2IntMap.java index bab3dbc04..9c30edd01 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/FixedInt2IntMap.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import it.unimi.dsi.fastutil.ints.AbstractInt2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntMap; diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java b/core/src/main/java/org/geysermc/geyser/util/collection/LecternHasBookMap.java similarity index 91% rename from core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java rename to core/src/main/java/org/geysermc/geyser/util/collection/LecternHasBookMap.java index 50d392a10..aaa780ed5 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/LecternHasBookMap.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator; -import org.geysermc.geyser.network.translators.world.WorldManager; -import org.geysermc.geyser.utils.BlockEntityUtils; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.inventory.LecternInventoryTranslator; +import org.geysermc.geyser.level.WorldManager; +import org.geysermc.geyser.util.BlockEntityUtils; /** * Map that takes advantage of its internals for fast operations on block states to determine if they are lecterns. diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java b/core/src/main/java/org/geysermc/geyser/util/collection/Object2IntBiMap.java similarity index 99% rename from core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java rename to core/src/main/java/org/geysermc/geyser/util/collection/Object2IntBiMap.java index 6a576105c..efd292a83 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/Object2IntBiMap.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java b/core/src/main/java/org/geysermc/geyser/util/collection/package-info.java similarity index 97% rename from core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java rename to core/src/main/java/org/geysermc/geyser/util/collection/package-info.java index 3628e0385..a4c188001 100644 --- a/core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java +++ b/core/src/main/java/org/geysermc/geyser/util/collection/package-info.java @@ -31,4 +31,4 @@ * and {@link java.util.Map#containsKey(java.lang.Object)} can be performed by simply checking the bounds of the map * size and its "start" integer. */ -package org.geysermc.geyser.utils.collections; \ No newline at end of file +package org.geysermc.geyser.util.collection; \ No newline at end of file diff --git a/core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java b/core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java deleted file mode 100644 index accf5bf6d..000000000 --- a/core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.geyser.utils; - -import java.nio.file.Files; -import java.nio.file.Paths; - -public class DockerCheck { - - // By default, Geyser now sets the IP to the local IP in all cases on plugin versions so we don't notify the user of anything - // However we still have this check for the potential future bug - public static boolean checkBasic() { - try { - String OS = System.getProperty("os.name").toLowerCase(); - if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) { - String output = new String(Files.readAllBytes(Paths.get("/proc/1/cgroup"))); - - if (output.contains("docker")) { - return true; - } - } - } catch (Exception ignored) { } // Ignore any errors, inc ip failed to fetch, process could not run or access denied - - return false; - } -} diff --git a/core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java b/core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java deleted file mode 100644 index c738a2654..000000000 --- a/core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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.geyser.utils; - -import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleType; -import com.nukkitx.protocol.bedrock.data.LevelEventType; -import org.geysermc.geyser.network.session.GeyserSession; -import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.registry.type.ParticleMapping; - -import javax.annotation.Nonnull; - -/** - * Util for particles and effects. - */ -public class EffectUtils { - - /** - * Used for area effect clouds. - * - * @param type the Java particle to search for - * @return the Bedrock integer ID of the particle, or -1 if it does not exist - */ - public static int getParticleId(GeyserSession session, @Nonnull ParticleType type) { - ParticleMapping mapping = Registries.PARTICLES.get(type); - if (mapping == null) { - return -1; - } - - LevelEventType levelEventType = mapping.levelEventType(); - if (levelEventType == null) { - return -1; - } - - // Remove the legacy bit applied to particles for LevelEventType serialization - return session.getUpstream().getSession().getPacketCodec().getHelper().getLevelEventId(levelEventType) & ~0x4000; - } -} diff --git a/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java b/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java index 2f4e95f1e..96298f98e 100644 --- a/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java +++ b/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java @@ -26,6 +26,7 @@ package org.geysermc.geyser.network.translators.chat; import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer; +import org.geysermc.geyser.translator.text.MessageTranslator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java b/core/src/test/java/org/geysermc/geyser/util/collection/GeyserCollectionsTest.java similarity index 99% rename from core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java rename to core/src/test/java/org/geysermc/geyser/util/collection/GeyserCollectionsTest.java index 1cbfd57a5..d2841db53 100644 --- a/core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java +++ b/core/src/test/java/org/geysermc/geyser/util/collection/GeyserCollectionsTest.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.geyser.utils.collections; +package org.geysermc.geyser.util.collection; import org.junit.Assert; import org.junit.Test;