From 7daac5e6105da26cbbcf28b4d339a69170488806 Mon Sep 17 00:00:00 2001 From: Felix Cravic Date: Fri, 24 Apr 2020 03:25:58 +0200 Subject: [PATCH] Package rename to net.minestom.server --- build.gradle | 2 +- src/main/java/fr/themode/demo/Main.java | 22 +++---- src/main/java/fr/themode/demo/PlayerInit.java | 56 +++++++----------- .../fr/themode/demo/blocks/StoneBlock.java | 12 ++-- .../demo/blocks/UpdatableBlockDemo.java | 14 ++--- .../themode/demo/commands/HealthCommand.java | 2 +- .../themode/demo/commands/SimpleCommand.java | 6 +- .../themode/demo/entity/ChickenCreature.java | 14 ++--- .../fr/themode/demo/entity/TestArrow.java | 6 +- .../demo/generator/ChunkGeneratorDemo.java | 6 +- .../demo/generator/NoiseTestGenerator.java | 8 +-- .../java/fr/themode/minestom/event/Event.java | 5 -- .../instance/block/UpdateConsumer.java | 10 ---- .../minestom/inventory/InventoryRule.java | 4 -- .../CreativeInventoryActionListener.java | 24 -------- .../themode/minestom/net/ConnectionState.java | 5 -- .../net/packet/client/ClientPacket.java | 9 --- .../packet/client/ClientPreplayPacket.java | 11 ---- .../net/packet/server/ServerPacket.java | 11 ---- .../minestom/server}/MinecraftServer.java | 36 ++++++------ .../minestom/server}/UpdateManager.java | 16 ++--- .../minestom/server}/Viewable.java | 8 +-- .../server}/benchmark/BenchmarkManager.java | 8 +-- .../server}/benchmark/ThreadResult.java | 2 +- .../minestom/server}/bossbar/BarColor.java | 4 +- .../minestom/server}/bossbar/BarDivision.java | 4 +- .../minestom/server}/bossbar/BossBar.java | 8 +-- .../minestom/server}/chat/Chat.java | 2 +- .../minestom/server}/chat/ChatColor.java | 4 +- .../server}/collision/BoundingBox.java | 8 +-- .../server}/collision/CollisionUtils.java | 10 ++-- .../server}/command/CommandManager.java | 8 +-- .../server}/command/CommandProcessor.java | 4 +- .../minestom/server}/data/Data.java | 6 +- .../minestom/server}/data/DataContainer.java | 8 +-- .../minestom/server}/data/DataManager.java | 8 +-- .../minestom/server}/data/DataType.java | 2 +- .../server}/data/type/BooleanData.java | 4 +- .../minestom/server}/data/type/ByteData.java | 4 +- .../server}/data/type/CharacterData.java | 4 +- .../minestom/server}/data/type/DataData.java | 8 +-- .../server}/data/type/DoubleData.java | 4 +- .../minestom/server}/data/type/FloatData.java | 4 +- .../server}/data/type/IntegerData.java | 4 +- .../minestom/server}/data/type/LongData.java | 4 +- .../minestom/server}/data/type/ShortData.java | 4 +- .../server}/data/type/StringData.java | 4 +- .../minestom/server}/entity/Entity.java | 32 +++++----- .../server}/entity/EntityCreature.java | 20 +++---- .../server}/entity/EntityManager.java | 14 ++--- .../minestom/server}/entity/EntityType.java | 2 +- .../server}/entity/ExperienceOrb.java | 6 +- .../minestom/server}/entity/GameMode.java | 2 +- .../minestom/server}/entity/ItemEntity.java | 6 +- .../minestom/server}/entity/LivingEntity.java | 24 ++++---- .../minestom/server}/entity/ObjectEntity.java | 6 +- .../minestom/server}/entity/Player.java | 58 +++++++++---------- .../entity/pathfinding/EntityPathFinder.java | 12 ++-- .../server}/entity/pathfinding/JPS.java | 10 ++-- .../server}/entity/property/Attribute.java | 2 +- .../server}/entity/task/EntityTask.java | 4 +- .../vehicle/PlayerVehicleInformation.java | 2 +- .../server}/event/AnimationEvent.java | 4 +- .../server}/event/ArmAnimationEvent.java | 2 +- .../server}/event/ArmorEquipEvent.java | 4 +- .../minestom/server}/event/AttackEvent.java | 4 +- .../minestom/server}/event/Callback.java | 2 +- .../server}/event/CancellableEvent.java | 2 +- .../minestom/server}/event/DeathEvent.java | 2 +- .../java/net/minestom/server/event/Event.java | 5 ++ .../minestom/server}/event/ItemDropEvent.java | 4 +- .../server}/event/PickupExperienceEvent.java | 2 +- .../server}/event/PickupItemEvent.java | 4 +- .../server}/event/PlayerBlockBreakEvent.java | 4 +- .../event/PlayerBlockInteractEvent.java | 6 +- .../server}/event/PlayerBlockPlaceEvent.java | 6 +- .../server}/event/PlayerChatEvent.java | 4 +- .../server}/event/PlayerCommandEvent.java | 4 +- .../server}/event/PlayerDisconnectEvent.java | 2 +- .../server}/event/PlayerInteractEvent.java | 6 +- .../server}/event/PlayerLoginEvent.java | 4 +- .../server}/event/PlayerMoveEvent.java | 4 +- .../event/PlayerPluginMessageEvent.java | 2 +- .../server}/event/PlayerRespawnEvent.java | 4 +- .../server}/event/PlayerSpawnEvent.java | 4 +- .../event/PlayerStartDiggingEvent.java | 6 +- .../server}/event/PlayerSwapItemEvent.java | 4 +- .../server}/event/PlayerTickEvent.java | 2 +- .../server}/event/PlayerUseItemEvent.java | 6 +- .../minestom/server}/instance/Biome.java | 2 +- .../server}/instance/BlockModifier.java | 16 ++--- .../minestom/server}/instance/Chunk.java | 30 +++++----- .../server}/instance/ChunkGenerator.java | 4 +- .../server}/instance/ChunkLoaderIO.java | 8 +-- .../minestom/server}/instance/Instance.java | 32 +++++----- .../server}/instance/InstanceContainer.java | 34 +++++------ .../server}/instance/InstanceManager.java | 6 +- .../server}/instance/SharedInstance.java | 12 ++-- .../server}/instance/batch/BlockBatch.java | 10 ++-- .../server}/instance/batch/ChunkBatch.java | 12 ++-- .../server}/instance/batch/InstanceBatch.java | 8 +-- .../server}/instance/block/Block.java | 2 +- .../server}/instance/block/BlockManager.java | 4 +- .../server}/instance/block/CustomBlock.java | 12 ++-- .../server/instance/block/UpdateConsumer.java | 10 ++++ .../block/rule/BlockPlacementRule.java | 8 +-- .../rule/vanilla/RedstonePlacementRule.java | 10 ++-- .../minestom/server}/inventory/Inventory.java | 20 +++---- .../inventory/InventoryClickHandler.java | 4 +- .../server}/inventory/InventoryModifier.java | 6 +- .../server}/inventory/InventoryProperty.java | 2 +- .../server/inventory/InventoryRule.java | 4 ++ .../server}/inventory/InventoryType.java | 2 +- .../server}/inventory/PlayerInventory.java | 28 ++++----- .../server}/inventory/click/ClickType.java | 2 +- .../click/InventoryClickLoopHandler.java | 4 +- .../click/InventoryClickProcessor.java | 12 ++-- .../inventory/click/InventoryClickResult.java | 4 +- .../condition/InventoryCondition.java | 6 +- .../condition/InventoryConditionResult.java | 4 +- .../inventory/type/VillagerInventory.java | 10 ++-- .../minestom/server}/io/ChunkReader.java | 16 ++--- .../minestom/server}/io/DataReader.java | 10 ++-- .../minestom/server}/io/IOManager.java | 6 +- .../minestom/server}/item/ItemStack.java | 8 +-- .../minestom/server}/item/Material.java | 4 +- .../minestom/server}/item/StackingRule.java | 2 +- .../item/rule/VanillaStackingRule.java | 6 +- .../server}/listener/AnimationListener.java | 10 ++-- .../listener/BlockPlacementListener.java | 44 +++++++------- .../server}/listener/ChatMessageListener.java | 16 ++--- .../CreativeInventoryActionListener.java | 22 +++++++ .../listener/EntityActionListener.java | 6 +- .../server}/listener/KeepAliveListener.java | 8 +-- .../listener/PlayerDiggingListener.java | 28 ++++----- .../server}/listener/PlayerHeldListener.java | 6 +- .../listener/PlayerPositionListener.java | 18 +++--- .../listener/PlayerVehicleListener.java | 6 +- .../listener/PluginMessageListener.java | 8 +-- .../server}/listener/RecipeListener.java | 8 +-- .../server}/listener/SettingsListener.java | 6 +- .../server}/listener/StatusListener.java | 10 ++-- .../server}/listener/TabCompleteListener.java | 6 +- .../server}/listener/UseEntityListener.java | 14 ++--- .../server}/listener/UseItemListener.java | 18 +++--- .../server}/listener/WindowListener.java | 20 +++---- .../listener/manager/PacketConsumer.java | 6 +- .../manager/PacketListenerManager.java | 14 ++--- .../server/network}/ConnectionManager.java | 10 ++-- .../server/network/ConnectionState.java | 5 ++ .../server/network}/PacketProcessor.java | 22 +++---- .../server/network}/PacketWriterUtils.java | 14 ++--- .../server/network}/netty/NettyServer.java | 8 +-- .../network}/netty/channel/ClientChannel.java | 20 +++---- .../network}/netty/channel/NettyDecoder.java | 6 +- .../network}/netty/packet/PacketHandler.java | 2 +- .../server/network}/packet/PacketReader.java | 10 ++-- .../server/network}/packet/PacketWriter.java | 12 ++-- .../network/packet/client/ClientPacket.java | 9 +++ .../packet/client/ClientPlayPacket.java | 6 +- .../packet/client/ClientPreplayPacket.java | 11 ++++ .../handler/ClientLoginPacketsHandler.java | 4 +- .../client/handler/ClientPacketsHandler.java | 4 +- .../handler/ClientPlayPacketsHandler.java | 4 +- .../handler/ClientStatusPacketsHandler.java | 6 +- .../client/handshake/HandshakePacket.java | 12 ++-- .../packet/client/login/LoginStartPacket.java | 34 +++++------ .../play/ClientAdvancementTabPacket.java | 6 +- .../client/play/ClientAnimationPacket.java | 8 +-- .../client/play/ClientChatMessagePacket.java | 6 +- .../play/ClientClickWindowButtonPacket.java | 32 +++++----- .../client/play/ClientClickWindowPacket.java | 8 +-- .../packet/client/play/ClientCloseWindow.java | 6 +- .../client/play/ClientCraftRecipeRequest.java | 6 +- .../ClientCreativeInventoryActionPacket.java | 8 +-- .../client/play/ClientEntityActionPacket.java | 6 +- .../play/ClientHeldItemChangePacket.java | 6 +- .../play/ClientInteractEntityPacket.java | 8 +-- .../client/play/ClientKeepAlivePacket.java | 6 +- .../client/play/ClientNameItemPacket.java | 6 +- .../client/play/ClientPickItemPacket.java | 6 +- .../play/ClientPlayerAbilitiesPacket.java | 6 +- .../ClientPlayerBlockPlacementPacket.java | 10 ++-- .../play/ClientPlayerDiggingPacket.java | 8 +-- .../client/play/ClientPlayerLookPacket.java | 6 +- .../client/play/ClientPlayerPacket.java | 6 +- .../ClientPlayerPositionAndLookPacket.java | 6 +- .../play/ClientPlayerPositionPacket.java | 6 +- .../play/ClientPluginMessagePacket.java | 6 +- .../client/play/ClientRecipeBookData.java | 6 +- .../play/ClientResourcePackStatusPacket.java | 6 +- .../client/play/ClientSelectTradePacket.java | 6 +- .../client/play/ClientSettingsPacket.java | 8 +-- .../client/play/ClientSpectatePacket.java | 6 +- .../client/play/ClientStatusPacket.java | 6 +- .../client/play/ClientSteerBoatPacket.java | 6 +- .../client/play/ClientSteerVehiclePacket.java | 6 +- .../client/play/ClientTabCompletePacket.java | 6 +- .../play/ClientTeleportConfirmPacket.java | 6 +- ...lientUpdateCommandBlockMinecartPacket.java | 6 +- .../play/ClientUpdateCommandBlockPacket.java | 8 +-- .../client/play/ClientUpdateSignPacket.java | 8 +-- .../client/play/ClientUseItemPacket.java | 8 +-- .../client/play/ClientVehicleMovePacket.java | 6 +- .../play/ClientWindowConfirmationPacket.java | 6 +- .../status/LegacyServerListPingPacket.java | 10 ++-- .../packet/client/status/PingPacket.java | 12 ++-- .../client/status/StatusRequestPacket.java | 18 +++--- .../network/packet/server/ServerPacket.java | 11 ++++ .../packet/server/ServerPacketIdentifier.java | 2 +- .../server/handshake/ResponsePacket.java | 6 +- .../packet/server/login/JoinGamePacket.java | 14 ++--- .../server/login/LoginSuccessPacket.java | 6 +- .../play/AcknowledgePlayerDiggingPacket.java | 12 ++-- .../server/play/AdvancementsPacket.java | 14 ++--- .../server/play/AttachEntityPacket.java | 8 +-- .../packet/server/play/BlockActionPacket.java | 10 ++-- .../play/BlockBreakAnimationPacket.java | 10 ++-- .../packet/server/play/BlockChangePacket.java | 10 ++-- .../packet/server/play/BossBarPacket.java | 16 ++--- .../packet/server/play/CameraPacket.java | 8 +-- .../server/play/ChangeGameStatePacket.java | 10 ++-- .../packet/server/play/ChatMessagePacket.java | 10 ++-- .../packet/server/play/ChunkDataPacket.java | 20 +++---- .../packet/server/play/CloseWindowPacket.java | 8 +-- .../packet/server/play/CollectItemPacket.java | 8 +-- .../server/play/ConfirmTransactionPacket.java | 8 +-- .../server/play/CraftRecipeResponse.java | 8 +-- .../server/play/DeclareCommandsPacket.java | 8 +-- .../server/play/DeclareRecipesPacket.java | 10 ++-- .../server/play/DestroyEntitiesPacket.java | 8 +-- .../packet/server/play/DisconnectPacket.java | 10 ++-- .../server/play/DisplayScoreboardPacket.java | 8 +-- .../packet/server/play/EffectPacket.java | 10 ++-- .../server/play/EntityAnimationPacket.java | 10 ++-- .../server/play/EntityEffectPacket.java | 8 +-- .../server/play/EntityEquipmentPacket.java | 12 ++-- .../server/play/EntityHeadLookPacket.java | 8 +-- .../server/play/EntityMetaDataPacket.java | 8 +-- .../packet/server/play/EntityPacket.java | 8 +-- .../play/EntityPositionAndRotationPacket.java | 8 +-- .../server/play/EntityPositionPacket.java | 8 +-- .../server/play/EntityPropertiesPacket.java | 8 +-- .../server/play/EntityRotationPacket.java | 8 +-- .../packet/server/play/EntitySoundEffect.java | 10 ++-- .../server/play/EntityStatusPacket.java | 8 +-- .../server/play/EntityTeleportPacket.java | 10 ++-- .../server/play/EntityVelocityPacket.java | 8 +-- .../packet/server/play/ExplosionPacket.java | 8 +-- .../packet/server/play/FacePlayerPacket.java | 10 ++-- .../server/play/HeldItemChangePacket.java | 8 +-- .../packet/server/play/KeepAlivePacket.java | 8 +-- .../server/play/MultiBlockChangePacket.java | 8 +-- .../server/play/NamedSoundEffectPacket.java | 10 ++-- .../packet/server/play/OpenBookPacket.java | 10 ++-- .../server/play/OpenHorseWindowPacket.java | 8 +-- .../server/play/OpenSignEditorPacket.java | 10 ++-- .../packet/server/play/OpenWindowPacket.java | 8 +-- .../packet/server/play/ParticlePacket.java | 8 +-- .../server/play/PlayerAbilitiesPacket.java | 8 +-- .../packet/server/play/PlayerInfoPacket.java | 10 ++-- .../play/PlayerListHeaderAndFooterPacket.java | 8 +-- .../play/PlayerPositionAndLookPacket.java | 10 ++-- .../server/play/PluginMessagePacket.java | 8 +-- .../server/play/RemoveEntityEffectPacket.java | 8 +-- .../server/play/ResourcePackSendPacket.java | 8 +-- .../packet/server/play/RespawnPacket.java | 16 ++--- .../play/ScoreboardObjectivePacket.java | 10 ++-- .../server/play/ServerDifficultyPacket.java | 10 ++-- .../packet/server/play/SetCooldownPacket.java | 8 +-- .../server/play/SetExperiencePacket.java | 8 +-- .../server/play/SetPassengersPacket.java | 8 +-- .../packet/server/play/SetSlotPacket.java | 10 ++-- .../packet/server/play/SoundEffectPacket.java | 10 ++-- .../packet/server/play/SpawnEntityPacket.java | 10 ++-- .../server/play/SpawnExperienceOrbPacket.java | 10 ++-- .../server/play/SpawnLivingEntityPacket.java | 10 ++-- .../server/play/SpawnPaintingPacket.java | 10 ++-- .../packet/server/play/SpawnPlayerPacket.java | 10 ++-- .../server/play/SpawnPositionPacket.java | 8 +-- .../server/play/SpawnWeatherEntityPacket.java | 8 +-- .../packet/server/play/StatisticsPacket.java | 10 ++-- .../packet/server/play/StopSoundPacket.java | 8 +-- .../packet/server/play/TabCompletePacket.java | 8 +-- .../packet/server/play/TeamsPacket.java | 12 ++-- .../packet/server/play/TimeUpdatePacket.java | 8 +-- .../packet/server/play/TitlePacket.java | 12 ++-- .../packet/server/play/TradeListPacket.java | 10 ++-- .../packet/server/play/UnloadChunkPacket.java | 8 +-- .../server/play/UnlockRecipesPacket.java | 8 +-- .../server/play/UpdateHealthPacket.java | 8 +-- .../packet/server/play/UpdateLightPacket.java | 8 +-- .../packet/server/play/UpdateScorePacket.java | 8 +-- .../server/play/UpdateViewPositionPacket.java | 10 ++-- .../packet/server/play/VehicleMovePacket.java | 8 +-- .../packet/server/play/WindowItemsPacket.java | 10 ++-- .../server/play/WindowPropertyPacket.java | 8 +-- .../packet/server/status/PongPacket.java | 6 +- .../network}/player/PlayerConnection.java | 8 +-- .../minestom/server}/particle/Particle.java | 2 +- .../server}/particle/ParticleCreator.java | 6 +- .../minestom/server}/ping/ResponseData.java | 2 +- .../server}/ping/ResponseDataConsumer.java | 4 +- .../minestom/server}/recipe/Recipe.java | 4 +- .../server}/recipe/RecipeManager.java | 4 +- .../minestom/server}/recipe/ShapedRecipe.java | 6 +- .../server}/recipe/ShapelessRecipe.java | 6 +- .../server}/recipe/SmeltingRecipe.java | 6 +- .../server}/registry/RegistryBlock.java | 2 +- .../server}/registry/RegistryEntityType.java | 2 +- .../server}/registry/RegistryItem.java | 2 +- .../server}/registry/RegistryMain.java | 14 ++--- .../server}/registry/RegistryParticle.java | 2 +- .../server}/registry/RegistrySound.java | 2 +- .../server}/registry/RegistryStat.java | 2 +- .../scoreboard/BelowNameScoreboard.java | 14 ++--- .../minestom/server}/scoreboard/Sidebar.java | 16 ++--- .../server}/scoreboard/SidebarTeam.java | 4 +- .../minestom/server}/scoreboard/Team.java | 10 ++-- .../server}/scoreboard/TeamManager.java | 2 +- .../minestom/server}/sound/Sound.java | 2 +- .../minestom/server}/sound/SoundCategory.java | 2 +- .../server}/stat/PlayerStatistic.java | 2 +- .../server}/stat/StatisticCategory.java | 2 +- .../minestom/server}/stat/StatisticType.java | 2 +- .../server}/timer/SchedulerManager.java | 10 ++-- .../minestom/server}/timer/Task.java | 4 +- .../minestom/server}/timer/TaskRunnable.java | 2 +- .../minestom/server}/utils/ArrayUtils.java | 2 +- .../minestom/server}/utils/BlockPosition.java | 2 +- .../minestom/server}/utils/ChunkUtils.java | 4 +- .../server}/utils/CompressionUtils.java | 2 +- .../minestom/server}/utils/EntityUtils.java | 12 ++-- .../server}/utils/GroupedCollections.java | 2 +- .../minestom/server}/utils/HexUtils.java | 2 +- .../minestom/server}/utils/MathUtils.java | 2 +- .../server}/utils/NbtReaderUtils.java | 6 +- .../minestom/server}/utils/PacketUtils.java | 6 +- .../minestom/server}/utils/Position.java | 2 +- .../server}/utils/PrimitiveConversion.java | 2 +- .../server}/utils/SerializerUtils.java | 2 +- .../minestom/server}/utils/Utils.java | 12 ++-- .../minestom/server}/utils/Vector.java | 2 +- .../server}/utils/buffer/BufferUtils.java | 2 +- .../server}/utils/buffer/BufferWrapper.java | 4 +- .../utils/consumer/StringConsumer.java | 2 +- .../utils/inventory/PlayerInventoryUtils.java | 2 +- .../server}/utils/noise/FastNoise.java | 2 +- .../server}/utils/thread/MinestomThread.java | 2 +- .../server}/utils/time/CooldownUtils.java | 2 +- .../minestom/server}/utils/time/TimeUnit.java | 4 +- .../server}/utils/time/UpdateOption.java | 2 +- .../minestom/server}/world/Difficulty.java | 2 +- .../minestom/server}/world/Dimension.java | 2 +- .../minestom/server}/world/LevelType.java | 2 +- 355 files changed, 1466 insertions(+), 1484 deletions(-) delete mode 100644 src/main/java/fr/themode/minestom/event/Event.java delete mode 100644 src/main/java/fr/themode/minestom/instance/block/UpdateConsumer.java delete mode 100644 src/main/java/fr/themode/minestom/inventory/InventoryRule.java delete mode 100644 src/main/java/fr/themode/minestom/listener/CreativeInventoryActionListener.java delete mode 100644 src/main/java/fr/themode/minestom/net/ConnectionState.java delete mode 100644 src/main/java/fr/themode/minestom/net/packet/client/ClientPacket.java delete mode 100644 src/main/java/fr/themode/minestom/net/packet/client/ClientPreplayPacket.java delete mode 100644 src/main/java/fr/themode/minestom/net/packet/server/ServerPacket.java rename src/main/java/{fr/themode/minestom => net/minestom/server}/MinecraftServer.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/UpdateManager.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/Viewable.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/benchmark/BenchmarkManager.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/benchmark/ThreadResult.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/bossbar/BarColor.java (65%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/bossbar/BarDivision.java (62%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/bossbar/BossBar.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/chat/Chat.java (96%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/chat/ChatColor.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/collision/BoundingBox.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/collision/CollisionUtils.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/command/CommandManager.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/command/CommandProcessor.java (63%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/Data.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/DataContainer.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/DataManager.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/DataType.java (78%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/BooleanData.java (77%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/ByteData.java (73%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/CharacterData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/DataData.java (75%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/DoubleData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/FloatData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/IntegerData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/LongData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/ShortData.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/data/type/StringData.java (75%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/Entity.java (96%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/EntityCreature.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/EntityManager.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/EntityType.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/ExperienceOrb.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/GameMode.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/ItemEntity.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/LivingEntity.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/ObjectEntity.java (84%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/Player.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/pathfinding/EntityPathFinder.java (79%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/pathfinding/JPS.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/property/Attribute.java (96%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/task/EntityTask.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/entity/vehicle/PlayerVehicleInformation.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/AnimationEvent.java (80%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/ArmAnimationEvent.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/ArmorEquipEvent.java (88%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/AttackEvent.java (73%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/Callback.java (67%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/CancellableEvent.java (87%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/DeathEvent.java (64%) create mode 100644 src/main/java/net/minestom/server/event/Event.java rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/ItemDropEvent.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PickupExperienceEvent.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PickupItemEvent.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerBlockBreakEvent.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerBlockInteractEvent.java (78%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerBlockPlaceEvent.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerChatEvent.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerCommandEvent.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerDisconnectEvent.java (60%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerInteractEvent.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerLoginEvent.java (77%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerMoveEvent.java (80%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerPluginMessageEvent.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerRespawnEvent.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerSpawnEvent.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerStartDiggingEvent.java (77%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerSwapItemEvent.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerTickEvent.java (57%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/event/PlayerUseItemEvent.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/Biome.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/BlockModifier.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/Chunk.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/ChunkGenerator.java (67%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/ChunkLoaderIO.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/Instance.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/InstanceContainer.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/InstanceManager.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/SharedInstance.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/batch/BlockBatch.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/batch/ChunkBatch.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/batch/InstanceBatch.java (55%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/block/Block.java (99%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/block/BlockManager.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/block/CustomBlock.java (86%) create mode 100644 src/main/java/net/minestom/server/instance/block/UpdateConsumer.java rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/block/rule/BlockPlacementRule.java (71%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/instance/block/rule/vanilla/RedstonePlacementRule.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/Inventory.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/InventoryClickHandler.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/InventoryModifier.java (70%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/InventoryProperty.java (96%) create mode 100644 src/main/java/net/minestom/server/inventory/InventoryRule.java rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/InventoryType.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/PlayerInventory.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/click/ClickType.java (75%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/click/InventoryClickLoopHandler.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/click/InventoryClickProcessor.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/click/InventoryClickResult.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/condition/InventoryCondition.java (52%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/condition/InventoryConditionResult.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/inventory/type/VillagerInventory.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/io/ChunkReader.java (84%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/io/DataReader.java (88%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/io/IOManager.java (69%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/item/ItemStack.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/item/Material.java (99%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/item/StackingRule.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/item/rule/VanillaStackingRule.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/AnimationListener.java (71%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/BlockPlacementListener.java (78%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/ChatMessageListener.java (85%) create mode 100644 src/main/java/net/minestom/server/listener/CreativeInventoryActionListener.java rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/EntityActionListener.java (80%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/KeepAliveListener.java (55%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/PlayerDiggingListener.java (88%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/PlayerHeldListener.java (61%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/PlayerPositionListener.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/PlayerVehicleListener.java (68%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/PluginMessageListener.java (59%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/RecipeListener.java (60%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/SettingsListener.java (67%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/StatusListener.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/TabCompleteListener.java (57%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/UseEntityListener.java (76%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/UseItemListener.java (88%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/WindowListener.java (84%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/manager/PacketConsumer.java (50%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/listener/manager/PacketListenerManager.java (90%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/ConnectionManager.java (91%) create mode 100644 src/main/java/net/minestom/server/network/ConnectionState.java rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/PacketProcessor.java (82%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/PacketWriterUtils.java (80%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/netty/NettyServer.java (89%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/netty/channel/ClientChannel.java (80%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/netty/channel/NettyDecoder.java (90%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/netty/packet/PacketHandler.java (70%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/PacketReader.java (90%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/PacketWriter.java (93%) create mode 100644 src/main/java/net/minestom/server/network/packet/client/ClientPacket.java rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/ClientPlayPacket.java (58%) create mode 100644 src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/handler/ClientLoginPacketsHandler.java (56%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/handler/ClientPacketsHandler.java (89%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/handler/ClientPlayPacketsHandler.java (95%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/handler/ClientStatusPacketsHandler.java (51%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/handshake/HandshakePacket.java (72%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/login/LoginStartPacket.java (86%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientAdvancementTabPacket.java (71%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientAnimationPacket.java (50%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientChatMessagePacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientClickWindowButtonPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientClickWindowPacket.java (70%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientCloseWindow.java (52%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientCraftRecipeRequest.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientCreativeInventoryActionPacket.java (55%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientEntityActionPacket.java (77%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientHeldItemChangePacket.java (52%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientInteractEntityPacket.java (80%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientKeepAlivePacket.java (51%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientNameItemPacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPickItemPacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerAbilitiesPacket.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerBlockPlacementPacket.java (74%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerDiggingPacket.java (76%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerLookPacket.java (63%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerPacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerPositionAndLookPacket.java (72%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPlayerPositionPacket.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientPluginMessagePacket.java (61%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientRecipeBookData.java (88%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientResourcePackStatusPacket.java (63%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientSelectTradePacket.java (54%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientSettingsPacket.java (75%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientSpectatePacket.java (54%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientStatusPacket.java (62%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientSteerBoatPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientSteerVehiclePacket.java (65%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientTabCompletePacket.java (61%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientTeleportConfirmPacket.java (54%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java (67%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientUpdateCommandBlockPacket.java (69%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientUpdateSignPacket.java (69%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientUseItemPacket.java (50%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientVehicleMovePacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/play/ClientWindowConfirmationPacket.java (67%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/status/LegacyServerListPingPacket.java (52%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/status/PingPacket.java (54%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/client/status/StatusRequestPacket.java (60%) create mode 100644 src/main/java/net/minestom/server/network/packet/server/ServerPacket.java rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/ServerPacketIdentifier.java (98%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/handshake/ResponsePacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/login/JoinGamePacket.java (73%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/login/LoginSuccessPacket.java (78%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/AcknowledgePlayerDiggingPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/AdvancementsPacket.java (92%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/AttachEntityPacket.java (61%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/BlockActionPacket.java (63%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/BlockBreakAnimationPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/BlockChangePacket.java (56%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/BossBarPacket.java (79%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/CameraPacket.java (52%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ChangeGameStatePacket.java (71%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ChatMessagePacket.java (69%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ChunkDataPacket.java (89%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/CloseWindowPacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/CollectItemPacket.java (65%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ConfirmTransactionPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/CraftRecipeResponse.java (59%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/DeclareCommandsPacket.java (87%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/DeclareRecipesPacket.java (90%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/DestroyEntitiesPacket.java (55%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/DisconnectPacket.java (52%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/DisplayScoreboardPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EffectPacket.java (62%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityAnimationPacket.java (65%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityEffectPacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityEquipmentPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityHeadLookPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityMetaDataPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityPacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityPositionAndRotationPacket.java (72%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityPositionPacket.java (67%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityPropertiesPacket.java (75%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityRotationPacket.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntitySoundEffect.java (65%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityStatusPacket.java (58%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityTeleportPacket.java (69%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/EntityVelocityPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ExplosionPacket.java (74%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/FacePlayerPacket.java (74%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/HeldItemChangePacket.java (53%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/KeepAlivePacket.java (57%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/MultiBlockChangePacket.java (80%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/NamedSoundEffectPacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/OpenBookPacket.java (50%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/OpenHorseWindowPacket.java (62%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/OpenSignEditorPacket.java (58%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/OpenWindowPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ParticlePacket.java (79%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/PlayerAbilitiesPacket.java (76%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/PlayerInfoPacket.java (93%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/PlayerListHeaderAndFooterPacket.java (75%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/PlayerPositionAndLookPacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/PluginMessagePacket.java (58%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/RemoveEntityEffectPacket.java (59%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ResourcePackSendPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/RespawnPacket.java (51%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ScoreboardObjectivePacket.java (67%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/ServerDifficultyPacket.java (57%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SetCooldownPacket.java (59%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SetExperiencePacket.java (63%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SetPassengersPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SetSlotPacket.java (58%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SoundEffectPacket.java (67%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnEntityPacket.java (76%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnExperienceOrbPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnLivingEntityPacket.java (77%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnPaintingPacket.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnPlayerPacket.java (70%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnPositionPacket.java (54%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/SpawnWeatherEntityPacket.java (65%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/StatisticsPacket.java (71%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/StopSoundPacket.java (66%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/TabCompletePacket.java (77%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/TeamsPacket.java (88%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/TimeUpdatePacket.java (58%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/TitlePacket.java (81%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/TradeListPacket.java (85%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UnloadChunkPacket.java (56%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UnlockRecipesPacket.java (82%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UpdateHealthPacket.java (62%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UpdateLightPacket.java (78%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UpdateScorePacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/UpdateViewPositionPacket.java (60%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/VehicleMovePacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/WindowItemsPacket.java (68%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/play/WindowPropertyPacket.java (62%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/packet/server/status/PongPacket.java (64%) rename src/main/java/{fr/themode/minestom/net => net/minestom/server/network}/player/PlayerConnection.java (87%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/particle/Particle.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/particle/ParticleCreator.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/ping/ResponseData.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/ping/ResponseDataConsumer.java (60%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/recipe/Recipe.java (88%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/recipe/RecipeManager.java (96%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/recipe/ShapedRecipe.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/recipe/ShapelessRecipe.java (82%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/recipe/SmeltingRecipe.java (87%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryBlock.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryEntityType.java (71%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryItem.java (69%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryMain.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryParticle.java (69%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistrySound.java (68%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/registry/RegistryStat.java (68%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/scoreboard/BelowNameScoreboard.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/scoreboard/Sidebar.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/scoreboard/SidebarTeam.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/scoreboard/Team.java (96%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/scoreboard/TeamManager.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/sound/Sound.java (99%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/sound/SoundCategory.java (81%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/stat/PlayerStatistic.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/stat/StatisticCategory.java (80%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/stat/StatisticType.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/timer/SchedulerManager.java (89%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/timer/Task.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/timer/TaskRunnable.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/ArrayUtils.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/BlockPosition.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/ChunkUtils.java (94%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/CompressionUtils.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/EntityUtils.java (85%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/GroupedCollections.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/HexUtils.java (87%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/MathUtils.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/NbtReaderUtils.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/PacketUtils.java (83%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/Position.java (98%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/PrimitiveConversion.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/SerializerUtils.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/Utils.java (95%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/Vector.java (99%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/buffer/BufferUtils.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/buffer/BufferWrapper.java (93%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/consumer/StringConsumer.java (65%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/inventory/PlayerInventoryUtils.java (97%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/noise/FastNoise.java (99%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/thread/MinestomThread.java (92%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/time/CooldownUtils.java (91%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/time/TimeUnit.java (78%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/utils/time/UpdateOption.java (90%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/world/Difficulty.java (86%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/world/Dimension.java (84%) rename src/main/java/{fr/themode/minestom => net/minestom/server}/world/LevelType.java (89%) diff --git a/build.gradle b/build.gradle index ed704d1d4..5090d2985 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'net.ltgt.apt' version '0.10' } -group 'fr.themode.minestom' +group 'net.minestom.server' version '1.0' sourceCompatibility = 1.11 diff --git a/src/main/java/fr/themode/demo/Main.java b/src/main/java/fr/themode/demo/Main.java index b382f1e28..5725637f5 100644 --- a/src/main/java/fr/themode/demo/Main.java +++ b/src/main/java/fr/themode/demo/Main.java @@ -4,17 +4,17 @@ import fr.themode.demo.blocks.StoneBlock; import fr.themode.demo.blocks.UpdatableBlockDemo; import fr.themode.demo.commands.HealthCommand; import fr.themode.demo.commands.SimpleCommand; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.command.CommandManager; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.instance.block.rule.vanilla.RedstonePlacementRule; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.Material; -import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket; -import fr.themode.minestom.recipe.RecipeManager; -import fr.themode.minestom.recipe.ShapelessRecipe; -import fr.themode.minestom.utils.time.TimeUnit; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.MinecraftServer; +import net.minestom.server.command.CommandManager; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.instance.block.rule.vanilla.RedstonePlacementRule; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.network.packet.server.play.DeclareRecipesPacket; +import net.minestom.server.recipe.RecipeManager; +import net.minestom.server.recipe.ShapelessRecipe; +import net.minestom.server.utils.time.TimeUnit; +import net.minestom.server.utils.time.UpdateOption; public class Main { diff --git a/src/main/java/fr/themode/demo/PlayerInit.java b/src/main/java/fr/themode/demo/PlayerInit.java index 2b14bd1a8..abce74e26 100644 --- a/src/main/java/fr/themode/demo/PlayerInit.java +++ b/src/main/java/fr/themode/demo/PlayerInit.java @@ -3,23 +3,23 @@ package fr.themode.demo; import fr.themode.demo.entity.ChickenCreature; import fr.themode.demo.generator.ChunkGeneratorDemo; import fr.themode.demo.generator.NoiseTestGenerator; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.benchmark.BenchmarkManager; -import fr.themode.minestom.benchmark.ThreadResult; -import fr.themode.minestom.entity.*; -import fr.themode.minestom.event.*; -import fr.themode.minestom.instance.InstanceContainer; -import fr.themode.minestom.inventory.Inventory; -import fr.themode.minestom.inventory.InventoryType; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.Material; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.timer.TaskRunnable; -import fr.themode.minestom.utils.MathUtils; -import fr.themode.minestom.utils.Position; -import fr.themode.minestom.utils.Vector; -import fr.themode.minestom.utils.time.TimeUnit; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.MinecraftServer; +import net.minestom.server.benchmark.BenchmarkManager; +import net.minestom.server.benchmark.ThreadResult; +import net.minestom.server.entity.*; +import net.minestom.server.event.*; +import net.minestom.server.instance.InstanceContainer; +import net.minestom.server.inventory.Inventory; +import net.minestom.server.inventory.InventoryType; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.timer.TaskRunnable; +import net.minestom.server.utils.MathUtils; +import net.minestom.server.utils.Position; +import net.minestom.server.utils.Vector; +import net.minestom.server.utils.time.TimeUnit; +import net.minestom.server.utils.time.UpdateOption; import java.util.Map; import java.util.UUID; @@ -88,6 +88,7 @@ public class PlayerInit { connectionManager.setPacketConsumer((player, packet) -> { // Listen to all received packet + // Returning true means cancelling the packet return false; }); @@ -150,26 +151,9 @@ public class PlayerInit { player.setGameMode(GameMode.SURVIVAL); player.teleport(new Position(0, 75, 0)); - /*Random random = new Random(); - for (int i = 0; i < 50; i++) { - ChickenCreature chickenCreature = new ChickenCreature(); - chickenCreature.refreshPosition(random.nextInt(100), 65, random.nextInt(100)); - chickenCreature.setInstance(getInstance()); - }*/ - //chickenCreature.addPassenger(this); - - /*for (int ix = 0; ix < 4; ix++) - for (int iz = 0; iz < 4; iz++) { - ItemEntity itemEntity = new ItemEntity(new ItemStack(1, (byte) 32)); - itemEntity.refreshPosition(ix, 68, iz); - //itemEntity.setNoGravity(true); - itemEntity.setInstance(getInstance()); - //itemEntity.remove(); - }*/ - ItemStack item = new ItemStack((short) 1, (byte) 43); - item.setDisplayName("LE NOM DE L'ITEM"); - //item.getLore().add("lol le lore"); + item.setDisplayName("Item name"); + item.getLore().add("a lore line"); player.getInventory().addItemStack(item); Inventory inventory = new Inventory(InventoryType.CHEST_1_ROW, "Test inventory"); diff --git a/src/main/java/fr/themode/demo/blocks/StoneBlock.java b/src/main/java/fr/themode/demo/blocks/StoneBlock.java index c22d440cc..77f3354ef 100644 --- a/src/main/java/fr/themode/demo/blocks/StoneBlock.java +++ b/src/main/java/fr/themode/demo/blocks/StoneBlock.java @@ -1,11 +1,11 @@ package fr.themode.demo.blocks; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.time.UpdateOption; public class StoneBlock extends CustomBlock { diff --git a/src/main/java/fr/themode/demo/blocks/UpdatableBlockDemo.java b/src/main/java/fr/themode/demo/blocks/UpdatableBlockDemo.java index e747a6cae..fe98d1e49 100644 --- a/src/main/java/fr/themode/demo/blocks/UpdatableBlockDemo.java +++ b/src/main/java/fr/themode/demo/blocks/UpdatableBlockDemo.java @@ -1,12 +1,12 @@ package fr.themode.demo.blocks; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.time.TimeUnit; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.time.TimeUnit; +import net.minestom.server.utils.time.UpdateOption; public class UpdatableBlockDemo extends CustomBlock { diff --git a/src/main/java/fr/themode/demo/commands/HealthCommand.java b/src/main/java/fr/themode/demo/commands/HealthCommand.java index 8487f5ade..2a5504fa5 100644 --- a/src/main/java/fr/themode/demo/commands/HealthCommand.java +++ b/src/main/java/fr/themode/demo/commands/HealthCommand.java @@ -5,7 +5,7 @@ import fr.themode.command.Command; import fr.themode.command.arguments.Argument; import fr.themode.command.arguments.ArgumentType; import fr.themode.command.arguments.number.ArgumentNumber; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; public class HealthCommand extends Command { diff --git a/src/main/java/fr/themode/demo/commands/SimpleCommand.java b/src/main/java/fr/themode/demo/commands/SimpleCommand.java index b100ec425..5e27c7f60 100644 --- a/src/main/java/fr/themode/demo/commands/SimpleCommand.java +++ b/src/main/java/fr/themode/demo/commands/SimpleCommand.java @@ -1,9 +1,9 @@ package fr.themode.demo.commands; import fr.themode.demo.entity.ChickenCreature; -import fr.themode.minestom.command.CommandProcessor; -import fr.themode.minestom.entity.EntityCreature; -import fr.themode.minestom.entity.Player; +import net.minestom.server.command.CommandProcessor; +import net.minestom.server.entity.EntityCreature; +import net.minestom.server.entity.Player; public class SimpleCommand implements CommandProcessor { @Override diff --git a/src/main/java/fr/themode/demo/entity/ChickenCreature.java b/src/main/java/fr/themode/demo/entity/ChickenCreature.java index 626991233..2d6bb34ed 100644 --- a/src/main/java/fr/themode/demo/entity/ChickenCreature.java +++ b/src/main/java/fr/themode/demo/entity/ChickenCreature.java @@ -1,12 +1,12 @@ package fr.themode.demo.entity; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.entity.EntityCreature; -import fr.themode.minestom.entity.EntityType; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.entity.vehicle.PlayerVehicleInformation; -import fr.themode.minestom.utils.Position; -import fr.themode.minestom.utils.Vector; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.EntityCreature; +import net.minestom.server.entity.EntityType; +import net.minestom.server.entity.Player; +import net.minestom.server.entity.vehicle.PlayerVehicleInformation; +import net.minestom.server.utils.Position; +import net.minestom.server.utils.Vector; public class ChickenCreature extends EntityCreature { diff --git a/src/main/java/fr/themode/demo/entity/TestArrow.java b/src/main/java/fr/themode/demo/entity/TestArrow.java index dc024b6cf..e103c0efe 100644 --- a/src/main/java/fr/themode/demo/entity/TestArrow.java +++ b/src/main/java/fr/themode/demo/entity/TestArrow.java @@ -1,8 +1,8 @@ package fr.themode.demo.entity; -import fr.themode.minestom.entity.EntityType; -import fr.themode.minestom.entity.LivingEntity; -import fr.themode.minestom.entity.ObjectEntity; +import net.minestom.server.entity.EntityType; +import net.minestom.server.entity.LivingEntity; +import net.minestom.server.entity.ObjectEntity; public class TestArrow extends ObjectEntity { diff --git a/src/main/java/fr/themode/demo/generator/ChunkGeneratorDemo.java b/src/main/java/fr/themode/demo/generator/ChunkGeneratorDemo.java index 45b4ac0d7..3500f95a7 100644 --- a/src/main/java/fr/themode/demo/generator/ChunkGeneratorDemo.java +++ b/src/main/java/fr/themode/demo/generator/ChunkGeneratorDemo.java @@ -1,8 +1,8 @@ package fr.themode.demo.generator; -import fr.themode.minestom.instance.Biome; -import fr.themode.minestom.instance.ChunkGenerator; -import fr.themode.minestom.instance.batch.ChunkBatch; +import net.minestom.server.instance.Biome; +import net.minestom.server.instance.ChunkGenerator; +import net.minestom.server.instance.batch.ChunkBatch; import java.util.Random; diff --git a/src/main/java/fr/themode/demo/generator/NoiseTestGenerator.java b/src/main/java/fr/themode/demo/generator/NoiseTestGenerator.java index 70137d640..275f496f1 100644 --- a/src/main/java/fr/themode/demo/generator/NoiseTestGenerator.java +++ b/src/main/java/fr/themode/demo/generator/NoiseTestGenerator.java @@ -1,9 +1,9 @@ package fr.themode.demo.generator; -import fr.themode.minestom.instance.Biome; -import fr.themode.minestom.instance.ChunkGenerator; -import fr.themode.minestom.instance.batch.ChunkBatch; -import fr.themode.minestom.utils.noise.FastNoise; +import net.minestom.server.instance.Biome; +import net.minestom.server.instance.ChunkGenerator; +import net.minestom.server.instance.batch.ChunkBatch; +import net.minestom.server.utils.noise.FastNoise; import java.util.Random; diff --git a/src/main/java/fr/themode/minestom/event/Event.java b/src/main/java/fr/themode/minestom/event/Event.java deleted file mode 100644 index 6ab64eca4..000000000 --- a/src/main/java/fr/themode/minestom/event/Event.java +++ /dev/null @@ -1,5 +0,0 @@ -package fr.themode.minestom.event; - -public class Event { - -} diff --git a/src/main/java/fr/themode/minestom/instance/block/UpdateConsumer.java b/src/main/java/fr/themode/minestom/instance/block/UpdateConsumer.java deleted file mode 100644 index 8cfeea6bb..000000000 --- a/src/main/java/fr/themode/minestom/instance/block/UpdateConsumer.java +++ /dev/null @@ -1,10 +0,0 @@ -package fr.themode.minestom.instance.block; - -import fr.themode.minestom.data.Data; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.utils.BlockPosition; - -@FunctionalInterface -public interface UpdateConsumer { - void update(Instance instance, BlockPosition blockPosition, Data data); -} diff --git a/src/main/java/fr/themode/minestom/inventory/InventoryRule.java b/src/main/java/fr/themode/minestom/inventory/InventoryRule.java deleted file mode 100644 index 65c668f1e..000000000 --- a/src/main/java/fr/themode/minestom/inventory/InventoryRule.java +++ /dev/null @@ -1,4 +0,0 @@ -package fr.themode.minestom.inventory; - -public class InventoryRule { -} diff --git a/src/main/java/fr/themode/minestom/listener/CreativeInventoryActionListener.java b/src/main/java/fr/themode/minestom/listener/CreativeInventoryActionListener.java deleted file mode 100644 index b19852a9a..000000000 --- a/src/main/java/fr/themode/minestom/listener/CreativeInventoryActionListener.java +++ /dev/null @@ -1,24 +0,0 @@ -package fr.themode.minestom.listener; - -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.client.play.ClientCreativeInventoryActionPacket; - -import static fr.themode.minestom.utils.inventory.PlayerInventoryUtils.OFFSET; -import static fr.themode.minestom.utils.inventory.PlayerInventoryUtils.convertSlot; - -public class CreativeInventoryActionListener { - - public static void listener(ClientCreativeInventoryActionPacket packet, Player player) { - if (player.getGameMode() != GameMode.CREATIVE) - return; - ItemStack item = packet.item; - short slot = packet.slot; - PlayerInventory inventory = player.getInventory(); - inventory.setItemStack(convertSlot(slot, OFFSET), item); - - } - -} diff --git a/src/main/java/fr/themode/minestom/net/ConnectionState.java b/src/main/java/fr/themode/minestom/net/ConnectionState.java deleted file mode 100644 index 31b8fc144..000000000 --- a/src/main/java/fr/themode/minestom/net/ConnectionState.java +++ /dev/null @@ -1,5 +0,0 @@ -package fr.themode.minestom.net; - -public enum ConnectionState { - UNKNOWN, STATUS, LOGIN, PLAY; -} diff --git a/src/main/java/fr/themode/minestom/net/packet/client/ClientPacket.java b/src/main/java/fr/themode/minestom/net/packet/client/ClientPacket.java deleted file mode 100644 index d69de13f6..000000000 --- a/src/main/java/fr/themode/minestom/net/packet/client/ClientPacket.java +++ /dev/null @@ -1,9 +0,0 @@ -package fr.themode.minestom.net.packet.client; - -import fr.themode.minestom.net.packet.PacketReader; - -public interface ClientPacket { - - void read(PacketReader reader); - -} diff --git a/src/main/java/fr/themode/minestom/net/packet/client/ClientPreplayPacket.java b/src/main/java/fr/themode/minestom/net/packet/client/ClientPreplayPacket.java deleted file mode 100644 index add46ca6a..000000000 --- a/src/main/java/fr/themode/minestom/net/packet/client/ClientPreplayPacket.java +++ /dev/null @@ -1,11 +0,0 @@ -package fr.themode.minestom.net.packet.client; - -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.player.PlayerConnection; - -public interface ClientPreplayPacket extends ClientPacket { - - - void process(PlayerConnection connection, ConnectionManager connectionManager); - -} diff --git a/src/main/java/fr/themode/minestom/net/packet/server/ServerPacket.java b/src/main/java/fr/themode/minestom/net/packet/server/ServerPacket.java deleted file mode 100644 index d6cc300bf..000000000 --- a/src/main/java/fr/themode/minestom/net/packet/server/ServerPacket.java +++ /dev/null @@ -1,11 +0,0 @@ -package fr.themode.minestom.net.packet.server; - -import fr.themode.minestom.net.packet.PacketWriter; - -public interface ServerPacket { - - void write(PacketWriter writer); - - int getId(); - -} diff --git a/src/main/java/fr/themode/minestom/MinecraftServer.java b/src/main/java/net/minestom/server/MinecraftServer.java similarity index 85% rename from src/main/java/fr/themode/minestom/MinecraftServer.java rename to src/main/java/net/minestom/server/MinecraftServer.java index dda062925..111d3df55 100644 --- a/src/main/java/fr/themode/minestom/MinecraftServer.java +++ b/src/main/java/net/minestom/server/MinecraftServer.java @@ -1,22 +1,22 @@ -package fr.themode.minestom; +package net.minestom.server; -import fr.themode.minestom.benchmark.BenchmarkManager; -import fr.themode.minestom.command.CommandManager; -import fr.themode.minestom.data.DataManager; -import fr.themode.minestom.entity.EntityManager; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.InstanceManager; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.listener.manager.PacketListenerManager; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.PacketProcessor; -import fr.themode.minestom.net.netty.NettyServer; -import fr.themode.minestom.net.packet.server.play.ServerDifficultyPacket; -import fr.themode.minestom.recipe.RecipeManager; -import fr.themode.minestom.registry.RegistryMain; -import fr.themode.minestom.scoreboard.TeamManager; -import fr.themode.minestom.timer.SchedulerManager; -import fr.themode.minestom.world.Difficulty; +import net.minestom.server.benchmark.BenchmarkManager; +import net.minestom.server.command.CommandManager; +import net.minestom.server.data.DataManager; +import net.minestom.server.entity.EntityManager; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.InstanceManager; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.listener.manager.PacketListenerManager; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.PacketProcessor; +import net.minestom.server.network.netty.NettyServer; +import net.minestom.server.network.packet.server.play.ServerDifficultyPacket; +import net.minestom.server.recipe.RecipeManager; +import net.minestom.server.registry.RegistryMain; +import net.minestom.server.scoreboard.TeamManager; +import net.minestom.server.timer.SchedulerManager; +import net.minestom.server.world.Difficulty; public class MinecraftServer { diff --git a/src/main/java/fr/themode/minestom/UpdateManager.java b/src/main/java/net/minestom/server/UpdateManager.java similarity index 83% rename from src/main/java/fr/themode/minestom/UpdateManager.java rename to src/main/java/net/minestom/server/UpdateManager.java index c6776462e..675713b74 100644 --- a/src/main/java/fr/themode/minestom/UpdateManager.java +++ b/src/main/java/net/minestom/server/UpdateManager.java @@ -1,12 +1,12 @@ -package fr.themode.minestom; +package net.minestom.server; -import fr.themode.minestom.entity.EntityManager; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.InstanceManager; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.packet.server.play.KeepAlivePacket; -import fr.themode.minestom.timer.SchedulerManager; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.entity.EntityManager; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.InstanceManager; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.packet.server.play.KeepAlivePacket; +import net.minestom.server.timer.SchedulerManager; +import net.minestom.server.utils.thread.MinestomThread; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/fr/themode/minestom/Viewable.java b/src/main/java/net/minestom/server/Viewable.java similarity index 86% rename from src/main/java/fr/themode/minestom/Viewable.java rename to src/main/java/net/minestom/server/Viewable.java index bb8d86f7a..72c8c8c56 100644 --- a/src/main/java/fr/themode/minestom/Viewable.java +++ b/src/main/java/net/minestom/server/Viewable.java @@ -1,8 +1,8 @@ -package fr.themode.minestom; +package net.minestom.server; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.PacketWriterUtils; -import fr.themode.minestom.net.packet.server.ServerPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.PacketWriterUtils; +import net.minestom.server.network.packet.server.ServerPacket; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/fr/themode/minestom/benchmark/BenchmarkManager.java b/src/main/java/net/minestom/server/benchmark/BenchmarkManager.java similarity index 95% rename from src/main/java/fr/themode/minestom/benchmark/BenchmarkManager.java rename to src/main/java/net/minestom/server/benchmark/BenchmarkManager.java index 021bb3a9f..59a214c0f 100644 --- a/src/main/java/fr/themode/minestom/benchmark/BenchmarkManager.java +++ b/src/main/java/net/minestom/server/benchmark/BenchmarkManager.java @@ -1,14 +1,14 @@ -package fr.themode.minestom.benchmark; +package net.minestom.server.benchmark; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.MinecraftServer; +import net.minestom.server.utils.time.UpdateOption; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import java.util.*; -import static fr.themode.minestom.MinecraftServer.*; +import static net.minestom.server.MinecraftServer.*; public class BenchmarkManager { diff --git a/src/main/java/fr/themode/minestom/benchmark/ThreadResult.java b/src/main/java/net/minestom/server/benchmark/ThreadResult.java similarity index 93% rename from src/main/java/fr/themode/minestom/benchmark/ThreadResult.java rename to src/main/java/net/minestom/server/benchmark/ThreadResult.java index 06df09ce6..9b08a8b62 100644 --- a/src/main/java/fr/themode/minestom/benchmark/ThreadResult.java +++ b/src/main/java/net/minestom/server/benchmark/ThreadResult.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.benchmark; +package net.minestom.server.benchmark; public class ThreadResult { diff --git a/src/main/java/fr/themode/minestom/bossbar/BarColor.java b/src/main/java/net/minestom/server/bossbar/BarColor.java similarity index 65% rename from src/main/java/fr/themode/minestom/bossbar/BarColor.java rename to src/main/java/net/minestom/server/bossbar/BarColor.java index 786a9e337..e566df101 100644 --- a/src/main/java/fr/themode/minestom/bossbar/BarColor.java +++ b/src/main/java/net/minestom/server/bossbar/BarColor.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.bossbar; +package net.minestom.server.bossbar; public enum BarColor { @@ -8,6 +8,6 @@ public enum BarColor { GREEN, YELLOW, PURPLE, - WHITE; + WHITE } diff --git a/src/main/java/fr/themode/minestom/bossbar/BarDivision.java b/src/main/java/net/minestom/server/bossbar/BarDivision.java similarity index 62% rename from src/main/java/fr/themode/minestom/bossbar/BarDivision.java rename to src/main/java/net/minestom/server/bossbar/BarDivision.java index 34fa8c3bd..93a26ec4b 100644 --- a/src/main/java/fr/themode/minestom/bossbar/BarDivision.java +++ b/src/main/java/net/minestom/server/bossbar/BarDivision.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.bossbar; +package net.minestom.server.bossbar; public enum BarDivision { @@ -6,6 +6,6 @@ public enum BarDivision { SEGMENT_6, SEGMENT_10, SEGMENT_12, - SEGMENT_20; + SEGMENT_20 } diff --git a/src/main/java/fr/themode/minestom/bossbar/BossBar.java b/src/main/java/net/minestom/server/bossbar/BossBar.java similarity index 95% rename from src/main/java/fr/themode/minestom/bossbar/BossBar.java rename to src/main/java/net/minestom/server/bossbar/BossBar.java index 627faaede..d57665b2b 100644 --- a/src/main/java/fr/themode/minestom/bossbar/BossBar.java +++ b/src/main/java/net/minestom/server/bossbar/BossBar.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.bossbar; +package net.minestom.server.bossbar; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.play.BossBarPacket; +import net.minestom.server.Viewable; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.play.BossBarPacket; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/fr/themode/minestom/chat/Chat.java b/src/main/java/net/minestom/server/chat/Chat.java similarity index 96% rename from src/main/java/fr/themode/minestom/chat/Chat.java rename to src/main/java/net/minestom/server/chat/Chat.java index 47ed2bca8..71d3b15ad 100644 --- a/src/main/java/fr/themode/minestom/chat/Chat.java +++ b/src/main/java/net/minestom/server/chat/Chat.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.chat; +package net.minestom.server.chat; import club.thectm.minecraft.text.LegacyText; import club.thectm.minecraft.text.TextObject; diff --git a/src/main/java/fr/themode/minestom/chat/ChatColor.java b/src/main/java/net/minestom/server/chat/ChatColor.java similarity index 89% rename from src/main/java/fr/themode/minestom/chat/ChatColor.java rename to src/main/java/net/minestom/server/chat/ChatColor.java index c20b3e65b..86bb3e05b 100644 --- a/src/main/java/fr/themode/minestom/chat/ChatColor.java +++ b/src/main/java/net/minestom/server/chat/ChatColor.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.chat; +package net.minestom.server.chat; -import fr.themode.minestom.utils.HexUtils; +import net.minestom.server.utils.HexUtils; public enum ChatColor { diff --git a/src/main/java/fr/themode/minestom/collision/BoundingBox.java b/src/main/java/net/minestom/server/collision/BoundingBox.java similarity index 94% rename from src/main/java/fr/themode/minestom/collision/BoundingBox.java rename to src/main/java/net/minestom/server/collision/BoundingBox.java index aed35fcac..7e2b26bbe 100644 --- a/src/main/java/fr/themode/minestom/collision/BoundingBox.java +++ b/src/main/java/net/minestom/server/collision/BoundingBox.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.collision; +package net.minestom.server.collision; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.Position; +import net.minestom.server.entity.Entity; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.Position; /** * See https://wiki.vg/Entity_metadata#Mobs_2 diff --git a/src/main/java/fr/themode/minestom/collision/CollisionUtils.java b/src/main/java/net/minestom/server/collision/CollisionUtils.java similarity index 86% rename from src/main/java/fr/themode/minestom/collision/CollisionUtils.java rename to src/main/java/net/minestom/server/collision/CollisionUtils.java index d7a63e046..8d1b70f7a 100644 --- a/src/main/java/fr/themode/minestom/collision/CollisionUtils.java +++ b/src/main/java/net/minestom/server/collision/CollisionUtils.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.collision; +package net.minestom.server.collision; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.Position; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.Position; public class CollisionUtils { diff --git a/src/main/java/fr/themode/minestom/command/CommandManager.java b/src/main/java/net/minestom/server/command/CommandManager.java similarity index 97% rename from src/main/java/fr/themode/minestom/command/CommandManager.java rename to src/main/java/net/minestom/server/command/CommandManager.java index aba8083c0..f2f8219f1 100644 --- a/src/main/java/fr/themode/minestom/command/CommandManager.java +++ b/src/main/java/net/minestom/server/command/CommandManager.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.command; +package net.minestom.server.command; import fr.themode.command.Command; import fr.themode.command.CommandDispatcher; @@ -7,9 +7,9 @@ import fr.themode.command.arguments.*; import fr.themode.command.arguments.number.ArgumentDouble; import fr.themode.command.arguments.number.ArgumentFloat; import fr.themode.command.arguments.number.ArgumentInteger; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.play.DeclareCommandsPacket; -import fr.themode.minestom.utils.ArrayUtils; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.play.DeclareCommandsPacket; +import net.minestom.server.utils.ArrayUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/themode/minestom/command/CommandProcessor.java b/src/main/java/net/minestom/server/command/CommandProcessor.java similarity index 63% rename from src/main/java/fr/themode/minestom/command/CommandProcessor.java rename to src/main/java/net/minestom/server/command/CommandProcessor.java index 79a4f8bb8..d236c1687 100644 --- a/src/main/java/fr/themode/minestom/command/CommandProcessor.java +++ b/src/main/java/net/minestom/server/command/CommandProcessor.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.command; +package net.minestom.server.command; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; public interface CommandProcessor { diff --git a/src/main/java/fr/themode/minestom/data/Data.java b/src/main/java/net/minestom/server/data/Data.java similarity index 94% rename from src/main/java/fr/themode/minestom/data/Data.java rename to src/main/java/net/minestom/server/data/Data.java index 1f0924e4c..cdf080132 100644 --- a/src/main/java/fr/themode/minestom/data/Data.java +++ b/src/main/java/net/minestom/server/data/Data.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.data; +package net.minestom.server.data; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.utils.PrimitiveConversion; +import net.minestom.server.MinecraftServer; +import net.minestom.server.utils.PrimitiveConversion; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/fr/themode/minestom/data/DataContainer.java b/src/main/java/net/minestom/server/data/DataContainer.java similarity index 91% rename from src/main/java/fr/themode/minestom/data/DataContainer.java rename to src/main/java/net/minestom/server/data/DataContainer.java index 793de0f87..ef34acb69 100644 --- a/src/main/java/fr/themode/minestom/data/DataContainer.java +++ b/src/main/java/net/minestom/server/data/DataContainer.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.data; +package net.minestom.server.data; -import fr.themode.minestom.io.DataReader; -import fr.themode.minestom.io.IOManager; -import fr.themode.minestom.utils.CompressionUtils; +import net.minestom.server.io.DataReader; +import net.minestom.server.io.IOManager; +import net.minestom.server.utils.CompressionUtils; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/fr/themode/minestom/data/DataManager.java b/src/main/java/net/minestom/server/data/DataManager.java similarity index 86% rename from src/main/java/fr/themode/minestom/data/DataManager.java rename to src/main/java/net/minestom/server/data/DataManager.java index 6f979575b..9e5897c95 100644 --- a/src/main/java/fr/themode/minestom/data/DataManager.java +++ b/src/main/java/net/minestom/server/data/DataManager.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.data; +package net.minestom.server.data; -import fr.themode.minestom.data.type.CharacterData; -import fr.themode.minestom.data.type.*; -import fr.themode.minestom.utils.PrimitiveConversion; +import net.minestom.server.data.type.CharacterData; +import net.minestom.server.data.type.*; +import net.minestom.server.utils.PrimitiveConversion; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/themode/minestom/data/DataType.java b/src/main/java/net/minestom/server/data/DataType.java similarity index 78% rename from src/main/java/fr/themode/minestom/data/DataType.java rename to src/main/java/net/minestom/server/data/DataType.java index 93b48194f..173776ddd 100644 --- a/src/main/java/fr/themode/minestom/data/DataType.java +++ b/src/main/java/net/minestom/server/data/DataType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.data; +package net.minestom.server.data; public abstract class DataType { diff --git a/src/main/java/fr/themode/minestom/data/type/BooleanData.java b/src/main/java/net/minestom/server/data/type/BooleanData.java similarity index 77% rename from src/main/java/fr/themode/minestom/data/type/BooleanData.java rename to src/main/java/net/minestom/server/data/type/BooleanData.java index bd4aa9598..8826fa9be 100644 --- a/src/main/java/fr/themode/minestom/data/type/BooleanData.java +++ b/src/main/java/net/minestom/server/data/type/BooleanData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; public class BooleanData extends DataType { @Override diff --git a/src/main/java/fr/themode/minestom/data/type/ByteData.java b/src/main/java/net/minestom/server/data/type/ByteData.java similarity index 73% rename from src/main/java/fr/themode/minestom/data/type/ByteData.java rename to src/main/java/net/minestom/server/data/type/ByteData.java index 5cf01afd1..61572927f 100644 --- a/src/main/java/fr/themode/minestom/data/type/ByteData.java +++ b/src/main/java/net/minestom/server/data/type/ByteData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; public class ByteData extends DataType { @Override diff --git a/src/main/java/fr/themode/minestom/data/type/CharacterData.java b/src/main/java/net/minestom/server/data/type/CharacterData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/CharacterData.java rename to src/main/java/net/minestom/server/data/type/CharacterData.java index d2a68bf0f..050d3c080 100644 --- a/src/main/java/fr/themode/minestom/data/type/CharacterData.java +++ b/src/main/java/net/minestom/server/data/type/CharacterData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/DataData.java b/src/main/java/net/minestom/server/data/type/DataData.java similarity index 75% rename from src/main/java/fr/themode/minestom/data/type/DataData.java rename to src/main/java/net/minestom/server/data/type/DataData.java index 977cc982e..5534ea6ed 100644 --- a/src/main/java/fr/themode/minestom/data/type/DataData.java +++ b/src/main/java/net/minestom/server/data/type/DataData.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.data.DataType; -import fr.themode.minestom.io.DataReader; +import net.minestom.server.data.Data; +import net.minestom.server.data.DataType; +import net.minestom.server.io.DataReader; import java.io.IOException; diff --git a/src/main/java/fr/themode/minestom/data/type/DoubleData.java b/src/main/java/net/minestom/server/data/type/DoubleData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/DoubleData.java rename to src/main/java/net/minestom/server/data/type/DoubleData.java index fd4239a70..6fc47e291 100644 --- a/src/main/java/fr/themode/minestom/data/type/DoubleData.java +++ b/src/main/java/net/minestom/server/data/type/DoubleData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/FloatData.java b/src/main/java/net/minestom/server/data/type/FloatData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/FloatData.java rename to src/main/java/net/minestom/server/data/type/FloatData.java index 5d52e98df..a4d370e5b 100644 --- a/src/main/java/fr/themode/minestom/data/type/FloatData.java +++ b/src/main/java/net/minestom/server/data/type/FloatData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/IntegerData.java b/src/main/java/net/minestom/server/data/type/IntegerData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/IntegerData.java rename to src/main/java/net/minestom/server/data/type/IntegerData.java index e39d733d8..01e1d859d 100644 --- a/src/main/java/fr/themode/minestom/data/type/IntegerData.java +++ b/src/main/java/net/minestom/server/data/type/IntegerData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/LongData.java b/src/main/java/net/minestom/server/data/type/LongData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/LongData.java rename to src/main/java/net/minestom/server/data/type/LongData.java index 9cb3142b5..589f6b713 100644 --- a/src/main/java/fr/themode/minestom/data/type/LongData.java +++ b/src/main/java/net/minestom/server/data/type/LongData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/ShortData.java b/src/main/java/net/minestom/server/data/type/ShortData.java similarity index 85% rename from src/main/java/fr/themode/minestom/data/type/ShortData.java rename to src/main/java/net/minestom/server/data/type/ShortData.java index c2e91b9bc..6296ceddf 100644 --- a/src/main/java/fr/themode/minestom/data/type/ShortData.java +++ b/src/main/java/net/minestom/server/data/type/ShortData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/data/type/StringData.java b/src/main/java/net/minestom/server/data/type/StringData.java similarity index 75% rename from src/main/java/fr/themode/minestom/data/type/StringData.java rename to src/main/java/net/minestom/server/data/type/StringData.java index b1bb99d44..18e345193 100644 --- a/src/main/java/fr/themode/minestom/data/type/StringData.java +++ b/src/main/java/net/minestom/server/data/type/StringData.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.data.type; +package net.minestom.server.data.type; -import fr.themode.minestom.data.DataType; +import net.minestom.server.data.DataType; public class StringData extends DataType { diff --git a/src/main/java/fr/themode/minestom/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java similarity index 96% rename from src/main/java/fr/themode/minestom/entity/Entity.java rename to src/main/java/net/minestom/server/entity/Entity.java index e019c1214..a5acaf697 100644 --- a/src/main/java/fr/themode/minestom/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -1,20 +1,20 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.collision.BoundingBox; -import fr.themode.minestom.collision.CollisionUtils; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.data.DataContainer; -import fr.themode.minestom.event.Callback; -import fr.themode.minestom.event.CancellableEvent; -import fr.themode.minestom.event.Event; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.play.*; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.utils.*; +import net.minestom.server.MinecraftServer; +import net.minestom.server.Viewable; +import net.minestom.server.collision.BoundingBox; +import net.minestom.server.collision.CollisionUtils; +import net.minestom.server.data.Data; +import net.minestom.server.data.DataContainer; +import net.minestom.server.event.Callback; +import net.minestom.server.event.CancellableEvent; +import net.minestom.server.event.Event; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.play.*; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.utils.*; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/fr/themode/minestom/entity/EntityCreature.java b/src/main/java/net/minestom/server/entity/EntityCreature.java similarity index 92% rename from src/main/java/fr/themode/minestom/entity/EntityCreature.java rename to src/main/java/net/minestom/server/entity/EntityCreature.java index 26b4de1a5..860ea06fc 100644 --- a/src/main/java/fr/themode/minestom/entity/EntityCreature.java +++ b/src/main/java/net/minestom/server/entity/EntityCreature.java @@ -1,14 +1,14 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.collision.CollisionUtils; -import fr.themode.minestom.entity.pathfinding.EntityPathFinder; -import fr.themode.minestom.entity.property.Attribute; -import fr.themode.minestom.net.packet.server.play.*; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.ChunkUtils; -import fr.themode.minestom.utils.Position; -import fr.themode.minestom.utils.Vector; +import net.minestom.server.collision.CollisionUtils; +import net.minestom.server.entity.pathfinding.EntityPathFinder; +import net.minestom.server.entity.property.Attribute; +import net.minestom.server.network.packet.server.play.*; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.ChunkUtils; +import net.minestom.server.utils.Position; +import net.minestom.server.utils.Vector; import java.util.LinkedList; diff --git a/src/main/java/fr/themode/minestom/entity/EntityManager.java b/src/main/java/net/minestom/server/entity/EntityManager.java similarity index 94% rename from src/main/java/fr/themode/minestom/entity/EntityManager.java rename to src/main/java/net/minestom/server/entity/EntityManager.java index 70e1c07fd..1fa867921 100644 --- a/src/main/java/fr/themode/minestom/entity/EntityManager.java +++ b/src/main/java/net/minestom/server/entity/EntityManager.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.event.PlayerLoginEvent; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.InstanceManager; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.MinecraftServer; +import net.minestom.server.event.PlayerLoginEvent; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.InstanceManager; +import net.minestom.server.utils.thread.MinestomThread; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/main/java/fr/themode/minestom/entity/EntityType.java b/src/main/java/net/minestom/server/entity/EntityType.java similarity index 98% rename from src/main/java/fr/themode/minestom/entity/EntityType.java rename to src/main/java/net/minestom/server/entity/EntityType.java index 2ffa97925..186611806 100644 --- a/src/main/java/fr/themode/minestom/entity/EntityType.java +++ b/src/main/java/net/minestom/server/entity/EntityType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/fr/themode/minestom/entity/ExperienceOrb.java b/src/main/java/net/minestom/server/entity/ExperienceOrb.java similarity index 86% rename from src/main/java/fr/themode/minestom/entity/ExperienceOrb.java rename to src/main/java/net/minestom/server/entity/ExperienceOrb.java index 51c587309..d65d49d8d 100644 --- a/src/main/java/fr/themode/minestom/entity/ExperienceOrb.java +++ b/src/main/java/net/minestom/server/entity/ExperienceOrb.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.net.packet.server.play.SpawnExperienceOrbPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.packet.server.play.SpawnExperienceOrbPacket; +import net.minestom.server.network.player.PlayerConnection; public class ExperienceOrb extends Entity { diff --git a/src/main/java/fr/themode/minestom/entity/GameMode.java b/src/main/java/net/minestom/server/entity/GameMode.java similarity index 92% rename from src/main/java/fr/themode/minestom/entity/GameMode.java rename to src/main/java/net/minestom/server/entity/GameMode.java index 0665db213..04878efc5 100644 --- a/src/main/java/fr/themode/minestom/entity/GameMode.java +++ b/src/main/java/net/minestom/server/entity/GameMode.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; public enum GameMode { diff --git a/src/main/java/fr/themode/minestom/entity/ItemEntity.java b/src/main/java/net/minestom/server/entity/ItemEntity.java similarity index 92% rename from src/main/java/fr/themode/minestom/entity/ItemEntity.java rename to src/main/java/net/minestom/server/entity/ItemEntity.java index 2a491e6af..3dd6c9a40 100644 --- a/src/main/java/fr/themode/minestom/entity/ItemEntity.java +++ b/src/main/java/net/minestom/server/entity/ItemEntity.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/entity/LivingEntity.java b/src/main/java/net/minestom/server/entity/LivingEntity.java similarity index 90% rename from src/main/java/fr/themode/minestom/entity/LivingEntity.java rename to src/main/java/net/minestom/server/entity/LivingEntity.java index 85b4d0d4a..a1a569eda 100644 --- a/src/main/java/fr/themode/minestom/entity/LivingEntity.java +++ b/src/main/java/net/minestom/server/entity/LivingEntity.java @@ -1,16 +1,16 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.collision.BoundingBox; -import fr.themode.minestom.entity.property.Attribute; -import fr.themode.minestom.event.DeathEvent; -import fr.themode.minestom.event.PickupItemEvent; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.play.CollectItemPacket; -import fr.themode.minestom.net.packet.server.play.EntityAnimationPacket; -import fr.themode.minestom.net.packet.server.play.EntityPropertiesPacket; -import fr.themode.minestom.utils.Position; +import net.minestom.server.collision.BoundingBox; +import net.minestom.server.entity.property.Attribute; +import net.minestom.server.event.DeathEvent; +import net.minestom.server.event.PickupItemEvent; +import net.minestom.server.instance.Chunk; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.play.CollectItemPacket; +import net.minestom.server.network.packet.server.play.EntityAnimationPacket; +import net.minestom.server.network.packet.server.play.EntityPropertiesPacket; +import net.minestom.server.utils.Position; import java.util.Set; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/entity/ObjectEntity.java b/src/main/java/net/minestom/server/entity/ObjectEntity.java similarity index 84% rename from src/main/java/fr/themode/minestom/entity/ObjectEntity.java rename to src/main/java/net/minestom/server/entity/ObjectEntity.java index b5f8df6bc..70fd69c4d 100644 --- a/src/main/java/fr/themode/minestom/entity/ObjectEntity.java +++ b/src/main/java/net/minestom/server/entity/ObjectEntity.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; -import fr.themode.minestom.net.packet.server.play.SpawnEntityPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.packet.server.play.SpawnEntityPacket; +import net.minestom.server.network.player.PlayerConnection; public abstract class ObjectEntity extends Entity { diff --git a/src/main/java/fr/themode/minestom/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java similarity index 95% rename from src/main/java/fr/themode/minestom/entity/Player.java rename to src/main/java/net/minestom/server/entity/Player.java index aca235a92..265b54fa0 100644 --- a/src/main/java/fr/themode/minestom/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -1,35 +1,35 @@ -package fr.themode.minestom.entity; +package net.minestom.server.entity; import club.thectm.minecraft.text.TextObject; import com.google.gson.JsonObject; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.bossbar.BossBar; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.collision.BoundingBox; -import fr.themode.minestom.entity.property.Attribute; -import fr.themode.minestom.entity.vehicle.PlayerVehicleInformation; -import fr.themode.minestom.event.*; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.inventory.Inventory; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.play.*; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.scoreboard.BelowNameScoreboard; -import fr.themode.minestom.scoreboard.Team; -import fr.themode.minestom.sound.Sound; -import fr.themode.minestom.sound.SoundCategory; -import fr.themode.minestom.stat.PlayerStatistic; -import fr.themode.minestom.utils.ArrayUtils; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.ChunkUtils; -import fr.themode.minestom.utils.Position; -import fr.themode.minestom.world.Dimension; -import fr.themode.minestom.world.LevelType; +import net.minestom.server.MinecraftServer; +import net.minestom.server.bossbar.BossBar; +import net.minestom.server.chat.Chat; +import net.minestom.server.collision.BoundingBox; +import net.minestom.server.entity.property.Attribute; +import net.minestom.server.entity.vehicle.PlayerVehicleInformation; +import net.minestom.server.event.*; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.inventory.Inventory; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.play.*; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.scoreboard.BelowNameScoreboard; +import net.minestom.server.scoreboard.Team; +import net.minestom.server.sound.Sound; +import net.minestom.server.sound.SoundCategory; +import net.minestom.server.stat.PlayerStatistic; +import net.minestom.server.utils.ArrayUtils; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.ChunkUtils; +import net.minestom.server.utils.Position; +import net.minestom.server.world.Dimension; +import net.minestom.server.world.LevelType; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/main/java/fr/themode/minestom/entity/pathfinding/EntityPathFinder.java b/src/main/java/net/minestom/server/entity/pathfinding/EntityPathFinder.java similarity index 79% rename from src/main/java/fr/themode/minestom/entity/pathfinding/EntityPathFinder.java rename to src/main/java/net/minestom/server/entity/pathfinding/EntityPathFinder.java index aad12d94f..38148ab3b 100644 --- a/src/main/java/fr/themode/minestom/entity/pathfinding/EntityPathFinder.java +++ b/src/main/java/net/minestom/server/entity/pathfinding/EntityPathFinder.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.entity.pathfinding; +package net.minestom.server.entity.pathfinding; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.Position; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Entity; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.Position; +import net.minestom.server.utils.thread.MinestomThread; import java.util.LinkedList; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/fr/themode/minestom/entity/pathfinding/JPS.java b/src/main/java/net/minestom/server/entity/pathfinding/JPS.java similarity index 97% rename from src/main/java/fr/themode/minestom/entity/pathfinding/JPS.java rename to src/main/java/net/minestom/server/entity/pathfinding/JPS.java index aaf9950f0..2285803bd 100644 --- a/src/main/java/fr/themode/minestom/entity/pathfinding/JPS.java +++ b/src/main/java/net/minestom/server/entity/pathfinding/JPS.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.entity.pathfinding; +package net.minestom.server.entity.pathfinding; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.Position; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.Position; import java.util.ArrayList; diff --git a/src/main/java/fr/themode/minestom/entity/property/Attribute.java b/src/main/java/net/minestom/server/entity/property/Attribute.java similarity index 96% rename from src/main/java/fr/themode/minestom/entity/property/Attribute.java rename to src/main/java/net/minestom/server/entity/property/Attribute.java index 9e8ce94ec..db0a8ae2d 100644 --- a/src/main/java/fr/themode/minestom/entity/property/Attribute.java +++ b/src/main/java/net/minestom/server/entity/property/Attribute.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.entity.property; +package net.minestom.server.entity.property; public enum Attribute { diff --git a/src/main/java/fr/themode/minestom/entity/task/EntityTask.java b/src/main/java/net/minestom/server/entity/task/EntityTask.java similarity index 90% rename from src/main/java/fr/themode/minestom/entity/task/EntityTask.java rename to src/main/java/net/minestom/server/entity/task/EntityTask.java index 3d50ccbe7..263aaffa0 100644 --- a/src/main/java/fr/themode/minestom/entity/task/EntityTask.java +++ b/src/main/java/net/minestom/server/entity/task/EntityTask.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.entity.task; +package net.minestom.server.entity.task; -import fr.themode.minestom.entity.LivingEntity; +import net.minestom.server.entity.LivingEntity; public abstract class EntityTask { diff --git a/src/main/java/fr/themode/minestom/entity/vehicle/PlayerVehicleInformation.java b/src/main/java/net/minestom/server/entity/vehicle/PlayerVehicleInformation.java similarity index 93% rename from src/main/java/fr/themode/minestom/entity/vehicle/PlayerVehicleInformation.java rename to src/main/java/net/minestom/server/entity/vehicle/PlayerVehicleInformation.java index 4c942c2bc..a23775cf7 100644 --- a/src/main/java/fr/themode/minestom/entity/vehicle/PlayerVehicleInformation.java +++ b/src/main/java/net/minestom/server/entity/vehicle/PlayerVehicleInformation.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.entity.vehicle; +package net.minestom.server.entity.vehicle; public class PlayerVehicleInformation { diff --git a/src/main/java/fr/themode/minestom/event/AnimationEvent.java b/src/main/java/net/minestom/server/event/AnimationEvent.java similarity index 80% rename from src/main/java/fr/themode/minestom/event/AnimationEvent.java rename to src/main/java/net/minestom/server/event/AnimationEvent.java index 6c34837f7..c1f1c5638 100644 --- a/src/main/java/fr/themode/minestom/event/AnimationEvent.java +++ b/src/main/java/net/minestom/server/event/AnimationEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; public class AnimationEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/ArmAnimationEvent.java b/src/main/java/net/minestom/server/event/ArmAnimationEvent.java similarity index 92% rename from src/main/java/fr/themode/minestom/event/ArmAnimationEvent.java rename to src/main/java/net/minestom/server/event/ArmAnimationEvent.java index 944811c52..6345f0328 100644 --- a/src/main/java/fr/themode/minestom/event/ArmAnimationEvent.java +++ b/src/main/java/net/minestom/server/event/ArmAnimationEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class ArmAnimationEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/ArmorEquipEvent.java b/src/main/java/net/minestom/server/event/ArmorEquipEvent.java similarity index 88% rename from src/main/java/fr/themode/minestom/event/ArmorEquipEvent.java rename to src/main/java/net/minestom/server/event/ArmorEquipEvent.java index 299bdb36c..5834075a1 100644 --- a/src/main/java/fr/themode/minestom/event/ArmorEquipEvent.java +++ b/src/main/java/net/minestom/server/event/ArmorEquipEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class ArmorEquipEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/AttackEvent.java b/src/main/java/net/minestom/server/event/AttackEvent.java similarity index 73% rename from src/main/java/fr/themode/minestom/event/AttackEvent.java rename to src/main/java/net/minestom/server/event/AttackEvent.java index bd8398502..077fc9b77 100644 --- a/src/main/java/fr/themode/minestom/event/AttackEvent.java +++ b/src/main/java/net/minestom/server/event/AttackEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Entity; +import net.minestom.server.entity.Entity; public class AttackEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/Callback.java b/src/main/java/net/minestom/server/event/Callback.java similarity index 67% rename from src/main/java/fr/themode/minestom/event/Callback.java rename to src/main/java/net/minestom/server/event/Callback.java index 63eae4013..fe3651331 100644 --- a/src/main/java/fr/themode/minestom/event/Callback.java +++ b/src/main/java/net/minestom/server/event/Callback.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public interface Callback { diff --git a/src/main/java/fr/themode/minestom/event/CancellableEvent.java b/src/main/java/net/minestom/server/event/CancellableEvent.java similarity index 87% rename from src/main/java/fr/themode/minestom/event/CancellableEvent.java rename to src/main/java/net/minestom/server/event/CancellableEvent.java index 1e2e76386..c03646384 100644 --- a/src/main/java/fr/themode/minestom/event/CancellableEvent.java +++ b/src/main/java/net/minestom/server/event/CancellableEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class CancellableEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/DeathEvent.java b/src/main/java/net/minestom/server/event/DeathEvent.java similarity index 64% rename from src/main/java/fr/themode/minestom/event/DeathEvent.java rename to src/main/java/net/minestom/server/event/DeathEvent.java index b169b38dc..804587143 100644 --- a/src/main/java/fr/themode/minestom/event/DeathEvent.java +++ b/src/main/java/net/minestom/server/event/DeathEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class DeathEvent extends Event { diff --git a/src/main/java/net/minestom/server/event/Event.java b/src/main/java/net/minestom/server/event/Event.java new file mode 100644 index 000000000..726285ce8 --- /dev/null +++ b/src/main/java/net/minestom/server/event/Event.java @@ -0,0 +1,5 @@ +package net.minestom.server.event; + +public class Event { + +} diff --git a/src/main/java/fr/themode/minestom/event/ItemDropEvent.java b/src/main/java/net/minestom/server/event/ItemDropEvent.java similarity index 76% rename from src/main/java/fr/themode/minestom/event/ItemDropEvent.java rename to src/main/java/net/minestom/server/event/ItemDropEvent.java index ed75665da..b59e66d97 100644 --- a/src/main/java/fr/themode/minestom/event/ItemDropEvent.java +++ b/src/main/java/net/minestom/server/event/ItemDropEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class ItemDropEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PickupExperienceEvent.java b/src/main/java/net/minestom/server/event/PickupExperienceEvent.java similarity index 92% rename from src/main/java/fr/themode/minestom/event/PickupExperienceEvent.java rename to src/main/java/net/minestom/server/event/PickupExperienceEvent.java index 9749bc045..93165501e 100644 --- a/src/main/java/fr/themode/minestom/event/PickupExperienceEvent.java +++ b/src/main/java/net/minestom/server/event/PickupExperienceEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class PickupExperienceEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PickupItemEvent.java b/src/main/java/net/minestom/server/event/PickupItemEvent.java similarity index 76% rename from src/main/java/fr/themode/minestom/event/PickupItemEvent.java rename to src/main/java/net/minestom/server/event/PickupItemEvent.java index c279021e8..53c157092 100644 --- a/src/main/java/fr/themode/minestom/event/PickupItemEvent.java +++ b/src/main/java/net/minestom/server/event/PickupItemEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class PickupItemEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerBlockBreakEvent.java b/src/main/java/net/minestom/server/event/PlayerBlockBreakEvent.java similarity index 90% rename from src/main/java/fr/themode/minestom/event/PlayerBlockBreakEvent.java rename to src/main/java/net/minestom/server/event/PlayerBlockBreakEvent.java index 97aab7b84..e66c6a4d4 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerBlockBreakEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerBlockBreakEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.utils.BlockPosition; public class PlayerBlockBreakEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerBlockInteractEvent.java b/src/main/java/net/minestom/server/event/PlayerBlockInteractEvent.java similarity index 78% rename from src/main/java/fr/themode/minestom/event/PlayerBlockInteractEvent.java rename to src/main/java/net/minestom/server/event/PlayerBlockInteractEvent.java index 46678c85f..71d7f3f55 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerBlockInteractEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerBlockInteractEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.entity.Player; +import net.minestom.server.utils.BlockPosition; public class PlayerBlockInteractEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerBlockPlaceEvent.java b/src/main/java/net/minestom/server/event/PlayerBlockPlaceEvent.java similarity index 86% rename from src/main/java/fr/themode/minestom/event/PlayerBlockPlaceEvent.java rename to src/main/java/net/minestom/server/event/PlayerBlockPlaceEvent.java index b4a6cd852..fb3f9c233 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerBlockPlaceEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerBlockPlaceEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.entity.Player; +import net.minestom.server.utils.BlockPosition; public class PlayerBlockPlaceEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerChatEvent.java b/src/main/java/net/minestom/server/event/PlayerChatEvent.java similarity index 93% rename from src/main/java/fr/themode/minestom/event/PlayerChatEvent.java rename to src/main/java/net/minestom/server/event/PlayerChatEvent.java index fbe020f06..1a29e8dcb 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerChatEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerChatEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; import club.thectm.minecraft.text.TextObject; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/themode/minestom/event/PlayerCommandEvent.java b/src/main/java/net/minestom/server/event/PlayerCommandEvent.java similarity index 85% rename from src/main/java/fr/themode/minestom/event/PlayerCommandEvent.java rename to src/main/java/net/minestom/server/event/PlayerCommandEvent.java index 23df78fc2..8e3cd91fc 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerCommandEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerCommandEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; public class PlayerCommandEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerDisconnectEvent.java b/src/main/java/net/minestom/server/event/PlayerDisconnectEvent.java similarity index 60% rename from src/main/java/fr/themode/minestom/event/PlayerDisconnectEvent.java rename to src/main/java/net/minestom/server/event/PlayerDisconnectEvent.java index e981f546a..b69d2dc93 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerDisconnectEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerDisconnectEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class PlayerDisconnectEvent extends Event { } diff --git a/src/main/java/fr/themode/minestom/event/PlayerInteractEvent.java b/src/main/java/net/minestom/server/event/PlayerInteractEvent.java similarity index 76% rename from src/main/java/fr/themode/minestom/event/PlayerInteractEvent.java rename to src/main/java/net/minestom/server/event/PlayerInteractEvent.java index fc954b8ca..a02798121 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerInteractEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerInteractEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Player; public class PlayerInteractEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/PlayerLoginEvent.java b/src/main/java/net/minestom/server/event/PlayerLoginEvent.java similarity index 77% rename from src/main/java/fr/themode/minestom/event/PlayerLoginEvent.java rename to src/main/java/net/minestom/server/event/PlayerLoginEvent.java index e30292b5d..00343018f 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerLoginEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerLoginEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.instance.Instance; +import net.minestom.server.instance.Instance; public class PlayerLoginEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/PlayerMoveEvent.java b/src/main/java/net/minestom/server/event/PlayerMoveEvent.java similarity index 80% rename from src/main/java/fr/themode/minestom/event/PlayerMoveEvent.java rename to src/main/java/net/minestom/server/event/PlayerMoveEvent.java index 0b51bb959..b522e22a7 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerMoveEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerMoveEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.utils.Position; +import net.minestom.server.utils.Position; public class PlayerMoveEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerPluginMessageEvent.java b/src/main/java/net/minestom/server/event/PlayerPluginMessageEvent.java similarity index 93% rename from src/main/java/fr/themode/minestom/event/PlayerPluginMessageEvent.java rename to src/main/java/net/minestom/server/event/PlayerPluginMessageEvent.java index 39fefb1eb..4b0924b9e 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerPluginMessageEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerPluginMessageEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class PlayerPluginMessageEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/PlayerRespawnEvent.java b/src/main/java/net/minestom/server/event/PlayerRespawnEvent.java similarity index 83% rename from src/main/java/fr/themode/minestom/event/PlayerRespawnEvent.java rename to src/main/java/net/minestom/server/event/PlayerRespawnEvent.java index dcc983c4f..d11e6aed2 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerRespawnEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerRespawnEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.utils.Position; +import net.minestom.server.utils.Position; public class PlayerRespawnEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/PlayerSpawnEvent.java b/src/main/java/net/minestom/server/event/PlayerSpawnEvent.java similarity index 76% rename from src/main/java/fr/themode/minestom/event/PlayerSpawnEvent.java rename to src/main/java/net/minestom/server/event/PlayerSpawnEvent.java index e9fc84504..7e932b616 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerSpawnEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerSpawnEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.instance.Instance; +import net.minestom.server.instance.Instance; public class PlayerSpawnEvent extends Event { diff --git a/src/main/java/fr/themode/minestom/event/PlayerStartDiggingEvent.java b/src/main/java/net/minestom/server/event/PlayerStartDiggingEvent.java similarity index 77% rename from src/main/java/fr/themode/minestom/event/PlayerStartDiggingEvent.java rename to src/main/java/net/minestom/server/event/PlayerStartDiggingEvent.java index 009b55e45..19f03700a 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerStartDiggingEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerStartDiggingEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.utils.BlockPosition; public class PlayerStartDiggingEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerSwapItemEvent.java b/src/main/java/net/minestom/server/event/PlayerSwapItemEvent.java similarity index 89% rename from src/main/java/fr/themode/minestom/event/PlayerSwapItemEvent.java rename to src/main/java/net/minestom/server/event/PlayerSwapItemEvent.java index 1855cc742..ae4464db0 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerSwapItemEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerSwapItemEvent.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class PlayerSwapItemEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/event/PlayerTickEvent.java b/src/main/java/net/minestom/server/event/PlayerTickEvent.java similarity index 57% rename from src/main/java/fr/themode/minestom/event/PlayerTickEvent.java rename to src/main/java/net/minestom/server/event/PlayerTickEvent.java index 436de4b09..719ad1de6 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerTickEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerTickEvent.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; public class PlayerTickEvent extends Event { } diff --git a/src/main/java/fr/themode/minestom/event/PlayerUseItemEvent.java b/src/main/java/net/minestom/server/event/PlayerUseItemEvent.java similarity index 76% rename from src/main/java/fr/themode/minestom/event/PlayerUseItemEvent.java rename to src/main/java/net/minestom/server/event/PlayerUseItemEvent.java index 50f2c7101..bdd73fae9 100644 --- a/src/main/java/fr/themode/minestom/event/PlayerUseItemEvent.java +++ b/src/main/java/net/minestom/server/event/PlayerUseItemEvent.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.event; +package net.minestom.server.event; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.entity.Player; +import net.minestom.server.item.ItemStack; public class PlayerUseItemEvent extends CancellableEvent { diff --git a/src/main/java/fr/themode/minestom/instance/Biome.java b/src/main/java/net/minestom/server/instance/Biome.java similarity index 98% rename from src/main/java/fr/themode/minestom/instance/Biome.java rename to src/main/java/net/minestom/server/instance/Biome.java index 5a92c2e88..665b9d3d4 100644 --- a/src/main/java/fr/themode/minestom/instance/Biome.java +++ b/src/main/java/net/minestom/server/instance/Biome.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; import java.util.Arrays; diff --git a/src/main/java/fr/themode/minestom/instance/BlockModifier.java b/src/main/java/net/minestom/server/instance/BlockModifier.java similarity index 83% rename from src/main/java/fr/themode/minestom/instance/BlockModifier.java rename to src/main/java/net/minestom/server/instance/BlockModifier.java index 9bf2ecb11..1210e9723 100644 --- a/src/main/java/fr/themode/minestom/instance/BlockModifier.java +++ b/src/main/java/net/minestom/server/instance/BlockModifier.java @@ -1,12 +1,12 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.Position; +import net.minestom.server.MinecraftServer; +import net.minestom.server.data.Data; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.Position; public interface BlockModifier { diff --git a/src/main/java/fr/themode/minestom/instance/Chunk.java b/src/main/java/net/minestom/server/instance/Chunk.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/Chunk.java rename to src/main/java/net/minestom/server/instance/Chunk.java index 46fa1472e..1969722bf 100644 --- a/src/main/java/fr/themode/minestom/instance/Chunk.java +++ b/src/main/java/net/minestom/server/instance/Chunk.java @@ -1,21 +1,21 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.instance.block.UpdateConsumer; -import fr.themode.minestom.net.packet.server.play.ChunkDataPacket; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.PacketUtils; -import fr.themode.minestom.utils.SerializerUtils; -import fr.themode.minestom.utils.time.CooldownUtils; -import fr.themode.minestom.utils.time.UpdateOption; import io.netty.buffer.ByteBuf; import it.unimi.dsi.fastutil.ints.*; +import net.minestom.server.MinecraftServer; +import net.minestom.server.Viewable; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.instance.block.UpdateConsumer; +import net.minestom.server.network.packet.server.play.ChunkDataPacket; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.PacketUtils; +import net.minestom.server.utils.SerializerUtils; +import net.minestom.server.utils.time.CooldownUtils; +import net.minestom.server.utils.time.UpdateOption; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/fr/themode/minestom/instance/ChunkGenerator.java b/src/main/java/net/minestom/server/instance/ChunkGenerator.java similarity index 67% rename from src/main/java/fr/themode/minestom/instance/ChunkGenerator.java rename to src/main/java/net/minestom/server/instance/ChunkGenerator.java index 29bbae53b..b88b61ffc 100644 --- a/src/main/java/fr/themode/minestom/instance/ChunkGenerator.java +++ b/src/main/java/net/minestom/server/instance/ChunkGenerator.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.instance.batch.ChunkBatch; +import net.minestom.server.instance.batch.ChunkBatch; public abstract class ChunkGenerator { diff --git a/src/main/java/fr/themode/minestom/instance/ChunkLoaderIO.java b/src/main/java/net/minestom/server/instance/ChunkLoaderIO.java similarity index 92% rename from src/main/java/fr/themode/minestom/instance/ChunkLoaderIO.java rename to src/main/java/net/minestom/server/instance/ChunkLoaderIO.java index f70bef21f..fe5aeaea0 100644 --- a/src/main/java/fr/themode/minestom/instance/ChunkLoaderIO.java +++ b/src/main/java/net/minestom/server/instance/ChunkLoaderIO.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.io.ChunkReader; -import fr.themode.minestom.io.IOManager; -import fr.themode.minestom.utils.CompressionUtils; +import net.minestom.server.io.ChunkReader; +import net.minestom.server.io.IOManager; +import net.minestom.server.utils.CompressionUtils; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/fr/themode/minestom/instance/Instance.java b/src/main/java/net/minestom/server/instance/Instance.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/Instance.java rename to src/main/java/net/minestom/server/instance/Instance.java index 002eaece4..37386fc8a 100644 --- a/src/main/java/fr/themode/minestom/instance/Instance.java +++ b/src/main/java/net/minestom/server/instance/Instance.java @@ -1,21 +1,21 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.data.DataContainer; -import fr.themode.minestom.entity.*; -import fr.themode.minestom.instance.batch.BlockBatch; -import fr.themode.minestom.instance.batch.ChunkBatch; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.net.PacketWriterUtils; -import fr.themode.minestom.net.packet.server.play.BlockActionPacket; -import fr.themode.minestom.net.packet.server.play.ChunkDataPacket; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.ChunkUtils; -import fr.themode.minestom.utils.Position; import io.netty.buffer.ByteBuf; +import net.minestom.server.MinecraftServer; +import net.minestom.server.data.Data; +import net.minestom.server.data.DataContainer; +import net.minestom.server.entity.*; +import net.minestom.server.instance.batch.BlockBatch; +import net.minestom.server.instance.batch.ChunkBatch; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.network.PacketWriterUtils; +import net.minestom.server.network.packet.server.play.BlockActionPacket; +import net.minestom.server.network.packet.server.play.ChunkDataPacket; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.ChunkUtils; +import net.minestom.server.utils.Position; import java.io.File; import java.util.*; diff --git a/src/main/java/fr/themode/minestom/instance/InstanceContainer.java b/src/main/java/net/minestom/server/instance/InstanceContainer.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/InstanceContainer.java rename to src/main/java/net/minestom/server/instance/InstanceContainer.java index 1004c5d5b..b5c695d8c 100644 --- a/src/main/java/fr/themode/minestom/instance/InstanceContainer.java +++ b/src/main/java/net/minestom/server/instance/InstanceContainer.java @@ -1,22 +1,22 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerBlockBreakEvent; -import fr.themode.minestom.instance.batch.BlockBatch; -import fr.themode.minestom.instance.batch.ChunkBatch; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.instance.block.rule.BlockPlacementRule; -import fr.themode.minestom.net.PacketWriterUtils; -import fr.themode.minestom.net.packet.server.play.BlockChangePacket; -import fr.themode.minestom.net.packet.server.play.ParticlePacket; -import fr.themode.minestom.net.packet.server.play.UnloadChunkPacket; -import fr.themode.minestom.particle.Particle; -import fr.themode.minestom.particle.ParticleCreator; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.ChunkUtils; -import fr.themode.minestom.utils.SerializerUtils; import io.netty.buffer.ByteBuf; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerBlockBreakEvent; +import net.minestom.server.instance.batch.BlockBatch; +import net.minestom.server.instance.batch.ChunkBatch; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.instance.block.rule.BlockPlacementRule; +import net.minestom.server.network.PacketWriterUtils; +import net.minestom.server.network.packet.server.play.BlockChangePacket; +import net.minestom.server.network.packet.server.play.ParticlePacket; +import net.minestom.server.network.packet.server.play.UnloadChunkPacket; +import net.minestom.server.particle.Particle; +import net.minestom.server.particle.ParticleCreator; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.ChunkUtils; +import net.minestom.server.utils.SerializerUtils; import java.io.File; import java.util.*; diff --git a/src/main/java/fr/themode/minestom/instance/InstanceManager.java b/src/main/java/net/minestom/server/instance/InstanceManager.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/InstanceManager.java rename to src/main/java/net/minestom/server/instance/InstanceManager.java index 263cea6c1..56eabf255 100644 --- a/src/main/java/fr/themode/minestom/instance/InstanceManager.java +++ b/src/main/java/net/minestom/server/instance/InstanceManager.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.MinecraftServer; +import net.minestom.server.utils.thread.MinestomThread; import java.io.File; import java.util.Collections; diff --git a/src/main/java/fr/themode/minestom/instance/SharedInstance.java b/src/main/java/net/minestom/server/instance/SharedInstance.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/SharedInstance.java rename to src/main/java/net/minestom/server/instance/SharedInstance.java index ed0bce5de..3aea2d4f1 100644 --- a/src/main/java/fr/themode/minestom/instance/SharedInstance.java +++ b/src/main/java/net/minestom/server/instance/SharedInstance.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.instance; +package net.minestom.server.instance; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.batch.BlockBatch; -import fr.themode.minestom.instance.batch.ChunkBatch; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.batch.BlockBatch; +import net.minestom.server.instance.batch.ChunkBatch; +import net.minestom.server.utils.BlockPosition; import java.io.File; import java.util.Collection; diff --git a/src/main/java/fr/themode/minestom/instance/batch/BlockBatch.java b/src/main/java/net/minestom/server/instance/batch/BlockBatch.java similarity index 92% rename from src/main/java/fr/themode/minestom/instance/batch/BlockBatch.java rename to src/main/java/net/minestom/server/instance/batch/BlockBatch.java index c02c717a0..e1806face 100644 --- a/src/main/java/fr/themode/minestom/instance/batch/BlockBatch.java +++ b/src/main/java/net/minestom/server/instance/batch/BlockBatch.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.instance.batch; +package net.minestom.server.instance.batch; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.InstanceContainer; -import fr.themode.minestom.utils.SerializerUtils; +import net.minestom.server.data.Data; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.InstanceContainer; +import net.minestom.server.utils.SerializerUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/themode/minestom/instance/batch/ChunkBatch.java b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java similarity index 89% rename from src/main/java/fr/themode/minestom/instance/batch/ChunkBatch.java rename to src/main/java/net/minestom/server/instance/batch/ChunkBatch.java index 7cad248ba..73e251dd7 100644 --- a/src/main/java/fr/themode/minestom/instance/batch/ChunkBatch.java +++ b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.instance.batch; +package net.minestom.server.instance.batch; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.ChunkGenerator; -import fr.themode.minestom.instance.InstanceContainer; -import fr.themode.minestom.utils.SerializerUtils; +import net.minestom.server.data.Data; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.ChunkGenerator; +import net.minestom.server.instance.InstanceContainer; +import net.minestom.server.utils.SerializerUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/fr/themode/minestom/instance/batch/InstanceBatch.java b/src/main/java/net/minestom/server/instance/batch/InstanceBatch.java similarity index 55% rename from src/main/java/fr/themode/minestom/instance/batch/InstanceBatch.java rename to src/main/java/net/minestom/server/instance/batch/InstanceBatch.java index 41c73ebec..3f5a43612 100644 --- a/src/main/java/fr/themode/minestom/instance/batch/InstanceBatch.java +++ b/src/main/java/net/minestom/server/instance/batch/InstanceBatch.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.instance.batch; +package net.minestom.server.instance.batch; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.instance.BlockModifier; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.MinecraftServer; +import net.minestom.server.instance.BlockModifier; +import net.minestom.server.utils.thread.MinestomThread; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/fr/themode/minestom/instance/block/Block.java b/src/main/java/net/minestom/server/instance/block/Block.java similarity index 99% rename from src/main/java/fr/themode/minestom/instance/block/Block.java rename to src/main/java/net/minestom/server/instance/block/Block.java index 2065fd6fd..d2b011a7d 100644 --- a/src/main/java/fr/themode/minestom/instance/block/Block.java +++ b/src/main/java/net/minestom/server/instance/block/Block.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.instance.block; +package net.minestom.server.instance.block; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; diff --git a/src/main/java/fr/themode/minestom/instance/block/BlockManager.java b/src/main/java/net/minestom/server/instance/block/BlockManager.java similarity index 93% rename from src/main/java/fr/themode/minestom/instance/block/BlockManager.java rename to src/main/java/net/minestom/server/instance/block/BlockManager.java index eab1c1223..c50176d84 100644 --- a/src/main/java/fr/themode/minestom/instance/block/BlockManager.java +++ b/src/main/java/net/minestom/server/instance/block/BlockManager.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.instance.block; +package net.minestom.server.instance.block; -import fr.themode.minestom.instance.block.rule.BlockPlacementRule; import it.unimi.dsi.fastutil.shorts.Short2ObjectMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; +import net.minestom.server.instance.block.rule.BlockPlacementRule; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/themode/minestom/instance/block/CustomBlock.java b/src/main/java/net/minestom/server/instance/block/CustomBlock.java similarity index 86% rename from src/main/java/fr/themode/minestom/instance/block/CustomBlock.java rename to src/main/java/net/minestom/server/instance/block/CustomBlock.java index 8c94b7f15..79dca802f 100644 --- a/src/main/java/fr/themode/minestom/instance/block/CustomBlock.java +++ b/src/main/java/net/minestom/server/instance/block/CustomBlock.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.instance.block; +package net.minestom.server.instance.block; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Player; +import net.minestom.server.instance.Instance; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.time.UpdateOption; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/net/minestom/server/instance/block/UpdateConsumer.java b/src/main/java/net/minestom/server/instance/block/UpdateConsumer.java new file mode 100644 index 000000000..17d054f03 --- /dev/null +++ b/src/main/java/net/minestom/server/instance/block/UpdateConsumer.java @@ -0,0 +1,10 @@ +package net.minestom.server.instance.block; + +import net.minestom.server.data.Data; +import net.minestom.server.instance.Instance; +import net.minestom.server.utils.BlockPosition; + +@FunctionalInterface +public interface UpdateConsumer { + void update(Instance instance, BlockPosition blockPosition, Data data); +} diff --git a/src/main/java/fr/themode/minestom/instance/block/rule/BlockPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java similarity index 71% rename from src/main/java/fr/themode/minestom/instance/block/rule/BlockPlacementRule.java rename to src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java index da6d21fa4..5543a1728 100644 --- a/src/main/java/fr/themode/minestom/instance/block/rule/BlockPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.instance.block.rule; +package net.minestom.server.instance.block.rule; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.utils.BlockPosition; public abstract class BlockPlacementRule { diff --git a/src/main/java/fr/themode/minestom/instance/block/rule/vanilla/RedstonePlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java similarity index 89% rename from src/main/java/fr/themode/minestom/instance/block/rule/vanilla/RedstonePlacementRule.java rename to src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java index 17641378a..182788585 100644 --- a/src/main/java/fr/themode/minestom/instance/block/rule/vanilla/RedstonePlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.instance.block.rule.vanilla; +package net.minestom.server.instance.block.rule.vanilla; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.instance.block.rule.BlockPlacementRule; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.rule.BlockPlacementRule; +import net.minestom.server.utils.BlockPosition; public class RedstonePlacementRule extends BlockPlacementRule { diff --git a/src/main/java/fr/themode/minestom/inventory/Inventory.java b/src/main/java/net/minestom/server/inventory/Inventory.java similarity index 95% rename from src/main/java/fr/themode/minestom/inventory/Inventory.java rename to src/main/java/net/minestom/server/inventory/Inventory.java index 8e26410a0..51a983e79 100644 --- a/src/main/java/fr/themode/minestom/inventory/Inventory.java +++ b/src/main/java/net/minestom/server/inventory/Inventory.java @@ -1,14 +1,14 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.inventory.click.InventoryClickLoopHandler; -import fr.themode.minestom.inventory.click.InventoryClickProcessor; -import fr.themode.minestom.inventory.click.InventoryClickResult; -import fr.themode.minestom.inventory.condition.InventoryCondition; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.server.play.SetSlotPacket; -import fr.themode.minestom.net.packet.server.play.WindowItemsPacket; +import net.minestom.server.Viewable; +import net.minestom.server.entity.Player; +import net.minestom.server.inventory.click.InventoryClickLoopHandler; +import net.minestom.server.inventory.click.InventoryClickProcessor; +import net.minestom.server.inventory.click.InventoryClickResult; +import net.minestom.server.inventory.condition.InventoryCondition; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.server.play.SetSlotPacket; +import net.minestom.server.network.packet.server.play.WindowItemsPacket; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/fr/themode/minestom/inventory/InventoryClickHandler.java b/src/main/java/net/minestom/server/inventory/InventoryClickHandler.java similarity index 86% rename from src/main/java/fr/themode/minestom/inventory/InventoryClickHandler.java rename to src/main/java/net/minestom/server/inventory/InventoryClickHandler.java index 3ef768fa9..d95b6b7ac 100644 --- a/src/main/java/fr/themode/minestom/inventory/InventoryClickHandler.java +++ b/src/main/java/net/minestom/server/inventory/InventoryClickHandler.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; -import fr.themode.minestom.entity.Player; +import net.minestom.server.entity.Player; public interface InventoryClickHandler { diff --git a/src/main/java/fr/themode/minestom/inventory/InventoryModifier.java b/src/main/java/net/minestom/server/inventory/InventoryModifier.java similarity index 70% rename from src/main/java/fr/themode/minestom/inventory/InventoryModifier.java rename to src/main/java/net/minestom/server/inventory/InventoryModifier.java index 01babbb2c..7856b6a33 100644 --- a/src/main/java/fr/themode/minestom/inventory/InventoryModifier.java +++ b/src/main/java/net/minestom/server/inventory/InventoryModifier.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; -import fr.themode.minestom.inventory.condition.InventoryCondition; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.inventory.condition.InventoryCondition; +import net.minestom.server.item.ItemStack; public interface InventoryModifier { diff --git a/src/main/java/fr/themode/minestom/inventory/InventoryProperty.java b/src/main/java/net/minestom/server/inventory/InventoryProperty.java similarity index 96% rename from src/main/java/fr/themode/minestom/inventory/InventoryProperty.java rename to src/main/java/net/minestom/server/inventory/InventoryProperty.java index 780ceb3a9..8c6ac908c 100644 --- a/src/main/java/fr/themode/minestom/inventory/InventoryProperty.java +++ b/src/main/java/net/minestom/server/inventory/InventoryProperty.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; public enum InventoryProperty { diff --git a/src/main/java/net/minestom/server/inventory/InventoryRule.java b/src/main/java/net/minestom/server/inventory/InventoryRule.java new file mode 100644 index 000000000..549f89a1b --- /dev/null +++ b/src/main/java/net/minestom/server/inventory/InventoryRule.java @@ -0,0 +1,4 @@ +package net.minestom.server.inventory; + +public class InventoryRule { +} diff --git a/src/main/java/fr/themode/minestom/inventory/InventoryType.java b/src/main/java/net/minestom/server/inventory/InventoryType.java similarity index 95% rename from src/main/java/fr/themode/minestom/inventory/InventoryType.java rename to src/main/java/net/minestom/server/inventory/InventoryType.java index ea33415c2..0e30a7e86 100644 --- a/src/main/java/fr/themode/minestom/inventory/InventoryType.java +++ b/src/main/java/net/minestom/server/inventory/InventoryType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; public enum InventoryType { diff --git a/src/main/java/fr/themode/minestom/inventory/PlayerInventory.java b/src/main/java/net/minestom/server/inventory/PlayerInventory.java similarity index 94% rename from src/main/java/fr/themode/minestom/inventory/PlayerInventory.java rename to src/main/java/net/minestom/server/inventory/PlayerInventory.java index b68e8ffc8..fe2837ca6 100644 --- a/src/main/java/fr/themode/minestom/inventory/PlayerInventory.java +++ b/src/main/java/net/minestom/server/inventory/PlayerInventory.java @@ -1,21 +1,21 @@ -package fr.themode.minestom.inventory; +package net.minestom.server.inventory; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.ArmorEquipEvent; -import fr.themode.minestom.inventory.click.InventoryClickLoopHandler; -import fr.themode.minestom.inventory.click.InventoryClickProcessor; -import fr.themode.minestom.inventory.click.InventoryClickResult; -import fr.themode.minestom.inventory.condition.InventoryCondition; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.StackingRule; -import fr.themode.minestom.net.packet.server.play.EntityEquipmentPacket; -import fr.themode.minestom.net.packet.server.play.SetSlotPacket; -import fr.themode.minestom.net.packet.server.play.WindowItemsPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.entity.Player; +import net.minestom.server.event.ArmorEquipEvent; +import net.minestom.server.inventory.click.InventoryClickLoopHandler; +import net.minestom.server.inventory.click.InventoryClickProcessor; +import net.minestom.server.inventory.click.InventoryClickResult; +import net.minestom.server.inventory.condition.InventoryCondition; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.StackingRule; +import net.minestom.server.network.packet.server.play.EntityEquipmentPacket; +import net.minestom.server.network.packet.server.play.SetSlotPacket; +import net.minestom.server.network.packet.server.play.WindowItemsPacket; +import net.minestom.server.network.player.PlayerConnection; import java.util.Arrays; -import static fr.themode.minestom.utils.inventory.PlayerInventoryUtils.*; +import static net.minestom.server.utils.inventory.PlayerInventoryUtils.*; public class PlayerInventory implements InventoryModifier, InventoryClickHandler { diff --git a/src/main/java/fr/themode/minestom/inventory/click/ClickType.java b/src/main/java/net/minestom/server/inventory/click/ClickType.java similarity index 75% rename from src/main/java/fr/themode/minestom/inventory/click/ClickType.java rename to src/main/java/net/minestom/server/inventory/click/ClickType.java index 0fdcf1e20..4bf6dbe19 100644 --- a/src/main/java/fr/themode/minestom/inventory/click/ClickType.java +++ b/src/main/java/net/minestom/server/inventory/click/ClickType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.inventory.click; +package net.minestom.server.inventory.click; public enum ClickType { diff --git a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickLoopHandler.java b/src/main/java/net/minestom/server/inventory/click/InventoryClickLoopHandler.java similarity index 93% rename from src/main/java/fr/themode/minestom/inventory/click/InventoryClickLoopHandler.java rename to src/main/java/net/minestom/server/inventory/click/InventoryClickLoopHandler.java index 12ab0ce68..206a218d2 100644 --- a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickLoopHandler.java +++ b/src/main/java/net/minestom/server/inventory/click/InventoryClickLoopHandler.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.inventory.click; +package net.minestom.server.inventory.click; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; import java.util.function.BiConsumer; import java.util.function.Function; diff --git a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickProcessor.java b/src/main/java/net/minestom/server/inventory/click/InventoryClickProcessor.java similarity index 98% rename from src/main/java/fr/themode/minestom/inventory/click/InventoryClickProcessor.java rename to src/main/java/net/minestom/server/inventory/click/InventoryClickProcessor.java index 9382c75b7..afb7e9be7 100644 --- a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickProcessor.java +++ b/src/main/java/net/minestom/server/inventory/click/InventoryClickProcessor.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.inventory.click; +package net.minestom.server.inventory.click; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.inventory.condition.InventoryCondition; -import fr.themode.minestom.inventory.condition.InventoryConditionResult; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.StackingRule; +import net.minestom.server.entity.Player; +import net.minestom.server.inventory.condition.InventoryCondition; +import net.minestom.server.inventory.condition.InventoryConditionResult; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.StackingRule; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickResult.java b/src/main/java/net/minestom/server/inventory/click/InventoryClickResult.java similarity index 91% rename from src/main/java/fr/themode/minestom/inventory/click/InventoryClickResult.java rename to src/main/java/net/minestom/server/inventory/click/InventoryClickResult.java index 012fc2b44..9ba746904 100644 --- a/src/main/java/fr/themode/minestom/inventory/click/InventoryClickResult.java +++ b/src/main/java/net/minestom/server/inventory/click/InventoryClickResult.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.inventory.click; +package net.minestom.server.inventory.click; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class InventoryClickResult { diff --git a/src/main/java/fr/themode/minestom/inventory/condition/InventoryCondition.java b/src/main/java/net/minestom/server/inventory/condition/InventoryCondition.java similarity index 52% rename from src/main/java/fr/themode/minestom/inventory/condition/InventoryCondition.java rename to src/main/java/net/minestom/server/inventory/condition/InventoryCondition.java index e48e6cf16..00395b976 100644 --- a/src/main/java/fr/themode/minestom/inventory/condition/InventoryCondition.java +++ b/src/main/java/net/minestom/server/inventory/condition/InventoryCondition.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.inventory.condition; +package net.minestom.server.inventory.condition; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.inventory.click.ClickType; +import net.minestom.server.entity.Player; +import net.minestom.server.inventory.click.ClickType; public interface InventoryCondition { diff --git a/src/main/java/fr/themode/minestom/inventory/condition/InventoryConditionResult.java b/src/main/java/net/minestom/server/inventory/condition/InventoryConditionResult.java similarity index 89% rename from src/main/java/fr/themode/minestom/inventory/condition/InventoryConditionResult.java rename to src/main/java/net/minestom/server/inventory/condition/InventoryConditionResult.java index 2bf79f38b..fb370d790 100644 --- a/src/main/java/fr/themode/minestom/inventory/condition/InventoryConditionResult.java +++ b/src/main/java/net/minestom/server/inventory/condition/InventoryConditionResult.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.inventory.condition; +package net.minestom.server.inventory.condition; -import fr.themode.minestom.item.ItemStack; +import net.minestom.server.item.ItemStack; public class InventoryConditionResult { diff --git a/src/main/java/fr/themode/minestom/inventory/type/VillagerInventory.java b/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java similarity index 90% rename from src/main/java/fr/themode/minestom/inventory/type/VillagerInventory.java rename to src/main/java/net/minestom/server/inventory/type/VillagerInventory.java index 110daf8e8..0286677b5 100644 --- a/src/main/java/fr/themode/minestom/inventory/type/VillagerInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.inventory.type; +package net.minestom.server.inventory.type; -import fr.themode.minestom.inventory.Inventory; -import fr.themode.minestom.inventory.InventoryType; -import fr.themode.minestom.net.packet.server.play.TradeListPacket; -import fr.themode.minestom.utils.ArrayUtils; +import net.minestom.server.inventory.Inventory; +import net.minestom.server.inventory.InventoryType; +import net.minestom.server.network.packet.server.play.TradeListPacket; +import net.minestom.server.utils.ArrayUtils; public class VillagerInventory extends Inventory { diff --git a/src/main/java/fr/themode/minestom/io/ChunkReader.java b/src/main/java/net/minestom/server/io/ChunkReader.java similarity index 84% rename from src/main/java/fr/themode/minestom/io/ChunkReader.java rename to src/main/java/net/minestom/server/io/ChunkReader.java index 7decfb03b..6e9a4c45a 100644 --- a/src/main/java/fr/themode/minestom/io/ChunkReader.java +++ b/src/main/java/net/minestom/server/io/ChunkReader.java @@ -1,12 +1,12 @@ -package fr.themode.minestom.io; +package net.minestom.server.io; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.instance.Biome; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.batch.ChunkBatch; -import fr.themode.minestom.utils.CompressionUtils; -import fr.themode.minestom.utils.SerializerUtils; +import net.minestom.server.data.Data; +import net.minestom.server.instance.Biome; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.batch.ChunkBatch; +import net.minestom.server.utils.CompressionUtils; +import net.minestom.server.utils.SerializerUtils; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/src/main/java/fr/themode/minestom/io/DataReader.java b/src/main/java/net/minestom/server/io/DataReader.java similarity index 88% rename from src/main/java/fr/themode/minestom/io/DataReader.java rename to src/main/java/net/minestom/server/io/DataReader.java index d2bb6163c..74e50b337 100644 --- a/src/main/java/fr/themode/minestom/io/DataReader.java +++ b/src/main/java/net/minestom/server/io/DataReader.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.io; +package net.minestom.server.io; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.data.DataManager; -import fr.themode.minestom.utils.CompressionUtils; +import net.minestom.server.MinecraftServer; +import net.minestom.server.data.Data; +import net.minestom.server.data.DataManager; +import net.minestom.server.utils.CompressionUtils; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/src/main/java/fr/themode/minestom/io/IOManager.java b/src/main/java/net/minestom/server/io/IOManager.java similarity index 69% rename from src/main/java/fr/themode/minestom/io/IOManager.java rename to src/main/java/net/minestom/server/io/IOManager.java index 816f217a5..495cbb231 100644 --- a/src/main/java/fr/themode/minestom/io/IOManager.java +++ b/src/main/java/net/minestom/server/io/IOManager.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.io; +package net.minestom.server.io; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.utils.thread.MinestomThread; +import net.minestom.server.MinecraftServer; +import net.minestom.server.utils.thread.MinestomThread; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/fr/themode/minestom/item/ItemStack.java b/src/main/java/net/minestom/server/item/ItemStack.java similarity index 95% rename from src/main/java/fr/themode/minestom/item/ItemStack.java rename to src/main/java/net/minestom/server/item/ItemStack.java index 65cafcdbb..3106f9419 100644 --- a/src/main/java/fr/themode/minestom/item/ItemStack.java +++ b/src/main/java/net/minestom/server/item/ItemStack.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.item; +package net.minestom.server.item; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.data.DataContainer; -import fr.themode.minestom.item.rule.VanillaStackingRule; +import net.minestom.server.data.Data; +import net.minestom.server.data.DataContainer; +import net.minestom.server.item.rule.VanillaStackingRule; import java.util.ArrayList; diff --git a/src/main/java/fr/themode/minestom/item/Material.java b/src/main/java/net/minestom/server/item/Material.java similarity index 99% rename from src/main/java/fr/themode/minestom/item/Material.java rename to src/main/java/net/minestom/server/item/Material.java index f30a7cd1f..06b58b6ac 100644 --- a/src/main/java/fr/themode/minestom/item/Material.java +++ b/src/main/java/net/minestom/server/item/Material.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.item; +package net.minestom.server.item; -import fr.themode.minestom.instance.block.Block; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; +import net.minestom.server.instance.block.Block; public enum Material { diff --git a/src/main/java/fr/themode/minestom/item/StackingRule.java b/src/main/java/net/minestom/server/item/StackingRule.java similarity index 93% rename from src/main/java/fr/themode/minestom/item/StackingRule.java rename to src/main/java/net/minestom/server/item/StackingRule.java index f86620e6f..938687dc9 100644 --- a/src/main/java/fr/themode/minestom/item/StackingRule.java +++ b/src/main/java/net/minestom/server/item/StackingRule.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.item; +package net.minestom.server.item; public abstract class StackingRule { diff --git a/src/main/java/fr/themode/minestom/item/rule/VanillaStackingRule.java b/src/main/java/net/minestom/server/item/rule/VanillaStackingRule.java similarity index 85% rename from src/main/java/fr/themode/minestom/item/rule/VanillaStackingRule.java rename to src/main/java/net/minestom/server/item/rule/VanillaStackingRule.java index cb8bd5814..fbdb93936 100644 --- a/src/main/java/fr/themode/minestom/item/rule/VanillaStackingRule.java +++ b/src/main/java/net/minestom/server/item/rule/VanillaStackingRule.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.item.rule; +package net.minestom.server.item.rule; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.StackingRule; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.StackingRule; public class VanillaStackingRule extends StackingRule { diff --git a/src/main/java/fr/themode/minestom/listener/AnimationListener.java b/src/main/java/net/minestom/server/listener/AnimationListener.java similarity index 71% rename from src/main/java/fr/themode/minestom/listener/AnimationListener.java rename to src/main/java/net/minestom/server/listener/AnimationListener.java index 286346542..7d3d55775 100644 --- a/src/main/java/fr/themode/minestom/listener/AnimationListener.java +++ b/src/main/java/net/minestom/server/listener/AnimationListener.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.AnimationEvent; -import fr.themode.minestom.net.packet.client.play.ClientAnimationPacket; -import fr.themode.minestom.net.packet.server.play.EntityAnimationPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.event.AnimationEvent; +import net.minestom.server.network.packet.client.play.ClientAnimationPacket; +import net.minestom.server.network.packet.server.play.EntityAnimationPacket; public class AnimationListener { diff --git a/src/main/java/fr/themode/minestom/listener/BlockPlacementListener.java b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java similarity index 78% rename from src/main/java/fr/themode/minestom/listener/BlockPlacementListener.java rename to src/main/java/net/minestom/server/listener/BlockPlacementListener.java index 883511008..2291fa20f 100644 --- a/src/main/java/fr/themode/minestom/listener/BlockPlacementListener.java +++ b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java @@ -1,26 +1,26 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.data.Data; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerBlockInteractEvent; -import fr.themode.minestom.event.PlayerBlockPlaceEvent; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.instance.block.BlockManager; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.instance.block.rule.BlockPlacementRule; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.Material; -import fr.themode.minestom.item.StackingRule; -import fr.themode.minestom.net.packet.client.play.ClientPlayerBlockPlacementPacket; -import fr.themode.minestom.net.packet.client.play.ClientPlayerDiggingPacket; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.ChunkUtils; +import net.minestom.server.MinecraftServer; +import net.minestom.server.data.Data; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerBlockInteractEvent; +import net.minestom.server.event.PlayerBlockPlaceEvent; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockManager; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.instance.block.rule.BlockPlacementRule; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.item.StackingRule; +import net.minestom.server.network.packet.client.play.ClientPlayerBlockPlacementPacket; +import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.ChunkUtils; import java.util.Set; diff --git a/src/main/java/fr/themode/minestom/listener/ChatMessageListener.java b/src/main/java/net/minestom/server/listener/ChatMessageListener.java similarity index 85% rename from src/main/java/fr/themode/minestom/listener/ChatMessageListener.java rename to src/main/java/net/minestom/server/listener/ChatMessageListener.java index 41ff74fc2..4da67b846 100644 --- a/src/main/java/fr/themode/minestom/listener/ChatMessageListener.java +++ b/src/main/java/net/minestom/server/listener/ChatMessageListener.java @@ -1,13 +1,13 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; import club.thectm.minecraft.text.*; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.command.CommandManager; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerChatEvent; -import fr.themode.minestom.event.PlayerCommandEvent; -import fr.themode.minestom.net.packet.client.play.ClientChatMessagePacket; +import net.minestom.server.MinecraftServer; +import net.minestom.server.chat.Chat; +import net.minestom.server.command.CommandManager; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerChatEvent; +import net.minestom.server.event.PlayerCommandEvent; +import net.minestom.server.network.packet.client.play.ClientChatMessagePacket; import java.util.function.Function; diff --git a/src/main/java/net/minestom/server/listener/CreativeInventoryActionListener.java b/src/main/java/net/minestom/server/listener/CreativeInventoryActionListener.java new file mode 100644 index 000000000..5b8fe725e --- /dev/null +++ b/src/main/java/net/minestom/server/listener/CreativeInventoryActionListener.java @@ -0,0 +1,22 @@ +package net.minestom.server.listener; + +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.client.play.ClientCreativeInventoryActionPacket; +import net.minestom.server.utils.inventory.PlayerInventoryUtils; + +public class CreativeInventoryActionListener { + + public static void listener(ClientCreativeInventoryActionPacket packet, Player player) { + if (player.getGameMode() != GameMode.CREATIVE) + return; + ItemStack item = packet.item; + short slot = packet.slot; + PlayerInventory inventory = player.getInventory(); + inventory.setItemStack(PlayerInventoryUtils.convertSlot(slot, PlayerInventoryUtils.OFFSET), item); + + } + +} diff --git a/src/main/java/fr/themode/minestom/listener/EntityActionListener.java b/src/main/java/net/minestom/server/listener/EntityActionListener.java similarity index 80% rename from src/main/java/fr/themode/minestom/listener/EntityActionListener.java rename to src/main/java/net/minestom/server/listener/EntityActionListener.java index 3f4206a54..6acebecc7 100644 --- a/src/main/java/fr/themode/minestom/listener/EntityActionListener.java +++ b/src/main/java/net/minestom/server/listener/EntityActionListener.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientEntityActionPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientEntityActionPacket; public class EntityActionListener { diff --git a/src/main/java/fr/themode/minestom/listener/KeepAliveListener.java b/src/main/java/net/minestom/server/listener/KeepAliveListener.java similarity index 55% rename from src/main/java/fr/themode/minestom/listener/KeepAliveListener.java rename to src/main/java/net/minestom/server/listener/KeepAliveListener.java index 28879ef09..6ac8cad64 100644 --- a/src/main/java/fr/themode/minestom/listener/KeepAliveListener.java +++ b/src/main/java/net/minestom/server/listener/KeepAliveListener.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.chat.ChatColor; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientKeepAlivePacket; +import net.minestom.server.chat.ChatColor; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientKeepAlivePacket; public class KeepAliveListener { diff --git a/src/main/java/fr/themode/minestom/listener/PlayerDiggingListener.java b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java similarity index 88% rename from src/main/java/fr/themode/minestom/listener/PlayerDiggingListener.java rename to src/main/java/net/minestom/server/listener/PlayerDiggingListener.java index 6075f4f12..23d5c4dfd 100644 --- a/src/main/java/fr/themode/minestom/listener/PlayerDiggingListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java @@ -1,18 +1,18 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerStartDiggingEvent; -import fr.themode.minestom.event.PlayerSwapItemEvent; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.CustomBlock; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.client.play.ClientPlayerDiggingPacket; -import fr.themode.minestom.net.packet.server.play.AcknowledgePlayerDiggingPacket; -import fr.themode.minestom.net.packet.server.play.EntityEffectPacket; -import fr.themode.minestom.net.packet.server.play.RemoveEntityEffectPacket; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerStartDiggingEvent; +import net.minestom.server.event.PlayerSwapItemEvent; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.CustomBlock; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket; +import net.minestom.server.network.packet.server.play.AcknowledgePlayerDiggingPacket; +import net.minestom.server.network.packet.server.play.EntityEffectPacket; +import net.minestom.server.network.packet.server.play.RemoveEntityEffectPacket; +import net.minestom.server.utils.BlockPosition; public class PlayerDiggingListener { diff --git a/src/main/java/fr/themode/minestom/listener/PlayerHeldListener.java b/src/main/java/net/minestom/server/listener/PlayerHeldListener.java similarity index 61% rename from src/main/java/fr/themode/minestom/listener/PlayerHeldListener.java rename to src/main/java/net/minestom/server/listener/PlayerHeldListener.java index cb9a9024f..0d32aea38 100644 --- a/src/main/java/fr/themode/minestom/listener/PlayerHeldListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerHeldListener.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientHeldItemChangePacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientHeldItemChangePacket; public class PlayerHeldListener { diff --git a/src/main/java/fr/themode/minestom/listener/PlayerPositionListener.java b/src/main/java/net/minestom/server/listener/PlayerPositionListener.java similarity index 83% rename from src/main/java/fr/themode/minestom/listener/PlayerPositionListener.java rename to src/main/java/net/minestom/server/listener/PlayerPositionListener.java index 5d49abc57..4b965bed2 100644 --- a/src/main/java/fr/themode/minestom/listener/PlayerPositionListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerPositionListener.java @@ -1,13 +1,13 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerMoveEvent; -import fr.themode.minestom.net.packet.client.play.ClientPlayerLookPacket; -import fr.themode.minestom.net.packet.client.play.ClientPlayerPacket; -import fr.themode.minestom.net.packet.client.play.ClientPlayerPositionAndLookPacket; -import fr.themode.minestom.net.packet.client.play.ClientPlayerPositionPacket; -import fr.themode.minestom.utils.ChunkUtils; -import fr.themode.minestom.utils.Position; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerMoveEvent; +import net.minestom.server.network.packet.client.play.ClientPlayerLookPacket; +import net.minestom.server.network.packet.client.play.ClientPlayerPacket; +import net.minestom.server.network.packet.client.play.ClientPlayerPositionAndLookPacket; +import net.minestom.server.network.packet.client.play.ClientPlayerPositionPacket; +import net.minestom.server.utils.ChunkUtils; +import net.minestom.server.utils.Position; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/listener/PlayerVehicleListener.java b/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java similarity index 68% rename from src/main/java/fr/themode/minestom/listener/PlayerVehicleListener.java rename to src/main/java/net/minestom/server/listener/PlayerVehicleListener.java index db4f57051..3bfd85cbf 100644 --- a/src/main/java/fr/themode/minestom/listener/PlayerVehicleListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientSteerVehiclePacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientSteerVehiclePacket; public class PlayerVehicleListener { diff --git a/src/main/java/fr/themode/minestom/listener/PluginMessageListener.java b/src/main/java/net/minestom/server/listener/PluginMessageListener.java similarity index 59% rename from src/main/java/fr/themode/minestom/listener/PluginMessageListener.java rename to src/main/java/net/minestom/server/listener/PluginMessageListener.java index 1a95fd607..fcf5ad924 100644 --- a/src/main/java/fr/themode/minestom/listener/PluginMessageListener.java +++ b/src/main/java/net/minestom/server/listener/PluginMessageListener.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.PlayerPluginMessageEvent; -import fr.themode.minestom.net.packet.client.play.ClientPluginMessagePacket; +import net.minestom.server.entity.Player; +import net.minestom.server.event.PlayerPluginMessageEvent; +import net.minestom.server.network.packet.client.play.ClientPluginMessagePacket; public class PluginMessageListener { diff --git a/src/main/java/fr/themode/minestom/listener/RecipeListener.java b/src/main/java/net/minestom/server/listener/RecipeListener.java similarity index 60% rename from src/main/java/fr/themode/minestom/listener/RecipeListener.java rename to src/main/java/net/minestom/server/listener/RecipeListener.java index 0501942b3..2b8622d04 100644 --- a/src/main/java/fr/themode/minestom/listener/RecipeListener.java +++ b/src/main/java/net/minestom/server/listener/RecipeListener.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientCraftRecipeRequest; -import fr.themode.minestom.net.packet.server.play.CraftRecipeResponse; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientCraftRecipeRequest; +import net.minestom.server.network.packet.server.play.CraftRecipeResponse; public class RecipeListener { diff --git a/src/main/java/fr/themode/minestom/listener/SettingsListener.java b/src/main/java/net/minestom/server/listener/SettingsListener.java similarity index 67% rename from src/main/java/fr/themode/minestom/listener/SettingsListener.java rename to src/main/java/net/minestom/server/listener/SettingsListener.java index 3daded0bb..e37fd2835 100644 --- a/src/main/java/fr/themode/minestom/listener/SettingsListener.java +++ b/src/main/java/net/minestom/server/listener/SettingsListener.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientSettingsPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientSettingsPacket; public class SettingsListener { diff --git a/src/main/java/fr/themode/minestom/listener/StatusListener.java b/src/main/java/net/minestom/server/listener/StatusListener.java similarity index 83% rename from src/main/java/fr/themode/minestom/listener/StatusListener.java rename to src/main/java/net/minestom/server/listener/StatusListener.java index 54c24a043..b03a4582c 100644 --- a/src/main/java/fr/themode/minestom/listener/StatusListener.java +++ b/src/main/java/net/minestom/server/listener/StatusListener.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientStatusPacket; -import fr.themode.minestom.net.packet.server.play.StatisticsPacket; -import fr.themode.minestom.stat.PlayerStatistic; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientStatusPacket; +import net.minestom.server.network.packet.server.play.StatisticsPacket; +import net.minestom.server.stat.PlayerStatistic; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/listener/TabCompleteListener.java b/src/main/java/net/minestom/server/listener/TabCompleteListener.java similarity index 57% rename from src/main/java/fr/themode/minestom/listener/TabCompleteListener.java rename to src/main/java/net/minestom/server/listener/TabCompleteListener.java index 8fc4339f7..57c21e265 100644 --- a/src/main/java/fr/themode/minestom/listener/TabCompleteListener.java +++ b/src/main/java/net/minestom/server/listener/TabCompleteListener.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.play.ClientTabCompletePacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.play.ClientTabCompletePacket; public class TabCompleteListener { diff --git a/src/main/java/fr/themode/minestom/listener/UseEntityListener.java b/src/main/java/net/minestom/server/listener/UseEntityListener.java similarity index 76% rename from src/main/java/fr/themode/minestom/listener/UseEntityListener.java rename to src/main/java/net/minestom/server/listener/UseEntityListener.java index 8bbb2683c..db2b72b4e 100644 --- a/src/main/java/fr/themode/minestom/listener/UseEntityListener.java +++ b/src/main/java/net/minestom/server/listener/UseEntityListener.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.entity.LivingEntity; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.AttackEvent; -import fr.themode.minestom.event.PlayerInteractEvent; -import fr.themode.minestom.net.packet.client.play.ClientInteractEntityPacket; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.LivingEntity; +import net.minestom.server.entity.Player; +import net.minestom.server.event.AttackEvent; +import net.minestom.server.event.PlayerInteractEvent; +import net.minestom.server.network.packet.client.play.ClientInteractEntityPacket; public class UseEntityListener { diff --git a/src/main/java/fr/themode/minestom/listener/UseItemListener.java b/src/main/java/net/minestom/server/listener/UseItemListener.java similarity index 88% rename from src/main/java/fr/themode/minestom/listener/UseItemListener.java rename to src/main/java/net/minestom/server/listener/UseItemListener.java index 8d2bd74f8..e4b9a4db2 100644 --- a/src/main/java/fr/themode/minestom/listener/UseItemListener.java +++ b/src/main/java/net/minestom/server/listener/UseItemListener.java @@ -1,13 +1,13 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.event.ArmAnimationEvent; -import fr.themode.minestom.event.ArmorEquipEvent; -import fr.themode.minestom.event.PlayerUseItemEvent; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.item.Material; -import fr.themode.minestom.net.packet.client.play.ClientUseItemPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.event.ArmAnimationEvent; +import net.minestom.server.event.ArmorEquipEvent; +import net.minestom.server.event.PlayerUseItemEvent; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.network.packet.client.play.ClientUseItemPacket; public class UseItemListener { diff --git a/src/main/java/fr/themode/minestom/listener/WindowListener.java b/src/main/java/net/minestom/server/listener/WindowListener.java similarity index 84% rename from src/main/java/fr/themode/minestom/listener/WindowListener.java rename to src/main/java/net/minestom/server/listener/WindowListener.java index 94c376965..92104ca56 100644 --- a/src/main/java/fr/themode/minestom/listener/WindowListener.java +++ b/src/main/java/net/minestom/server/listener/WindowListener.java @@ -1,14 +1,14 @@ -package fr.themode.minestom.listener; +package net.minestom.server.listener; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.inventory.Inventory; -import fr.themode.minestom.inventory.InventoryClickHandler; -import fr.themode.minestom.inventory.PlayerInventory; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.client.play.ClientClickWindowPacket; -import fr.themode.minestom.net.packet.client.play.ClientCloseWindow; -import fr.themode.minestom.net.packet.server.play.ConfirmTransactionPacket; -import fr.themode.minestom.net.packet.server.play.SetSlotPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.inventory.Inventory; +import net.minestom.server.inventory.InventoryClickHandler; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.client.play.ClientClickWindowPacket; +import net.minestom.server.network.packet.client.play.ClientCloseWindow; +import net.minestom.server.network.packet.server.play.ConfirmTransactionPacket; +import net.minestom.server.network.packet.server.play.SetSlotPacket; public class WindowListener { diff --git a/src/main/java/fr/themode/minestom/listener/manager/PacketConsumer.java b/src/main/java/net/minestom/server/listener/manager/PacketConsumer.java similarity index 50% rename from src/main/java/fr/themode/minestom/listener/manager/PacketConsumer.java rename to src/main/java/net/minestom/server/listener/manager/PacketConsumer.java index 47621c820..7f2a4510d 100644 --- a/src/main/java/fr/themode/minestom/listener/manager/PacketConsumer.java +++ b/src/main/java/net/minestom/server/listener/manager/PacketConsumer.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.listener.manager; +package net.minestom.server.listener.manager; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.client.ClientPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.client.ClientPacket; @FunctionalInterface public interface PacketConsumer { diff --git a/src/main/java/fr/themode/minestom/listener/manager/PacketListenerManager.java b/src/main/java/net/minestom/server/listener/manager/PacketListenerManager.java similarity index 90% rename from src/main/java/fr/themode/minestom/listener/manager/PacketListenerManager.java rename to src/main/java/net/minestom/server/listener/manager/PacketListenerManager.java index 4b8650c53..4f86f39fb 100644 --- a/src/main/java/fr/themode/minestom/listener/manager/PacketListenerManager.java +++ b/src/main/java/net/minestom/server/listener/manager/PacketListenerManager.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.listener.manager; +package net.minestom.server.listener.manager; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.listener.*; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.net.packet.client.play.*; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Player; +import net.minestom.server.listener.*; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.client.play.*; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/fr/themode/minestom/net/ConnectionManager.java b/src/main/java/net/minestom/server/network/ConnectionManager.java similarity index 91% rename from src/main/java/fr/themode/minestom/net/ConnectionManager.java rename to src/main/java/net/minestom/server/network/ConnectionManager.java index 25394329d..46bb29a84 100644 --- a/src/main/java/fr/themode/minestom/net/ConnectionManager.java +++ b/src/main/java/net/minestom/server/network/ConnectionManager.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net; +package net.minestom.server.network; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.listener.manager.PacketConsumer; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.ping.ResponseDataConsumer; +import net.minestom.server.entity.Player; +import net.minestom.server.listener.manager.PacketConsumer; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.ping.ResponseDataConsumer; import java.util.*; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/src/main/java/net/minestom/server/network/ConnectionState.java b/src/main/java/net/minestom/server/network/ConnectionState.java new file mode 100644 index 000000000..a88540a5c --- /dev/null +++ b/src/main/java/net/minestom/server/network/ConnectionState.java @@ -0,0 +1,5 @@ +package net.minestom.server.network; + +public enum ConnectionState { + UNKNOWN, STATUS, LOGIN, PLAY +} diff --git a/src/main/java/fr/themode/minestom/net/PacketProcessor.java b/src/main/java/net/minestom/server/network/PacketProcessor.java similarity index 82% rename from src/main/java/fr/themode/minestom/net/PacketProcessor.java rename to src/main/java/net/minestom/server/network/PacketProcessor.java index 21d35bd5c..0b2c3fe94 100644 --- a/src/main/java/fr/themode/minestom/net/PacketProcessor.java +++ b/src/main/java/net/minestom/server/network/PacketProcessor.java @@ -1,17 +1,17 @@ -package fr.themode.minestom.net; +package net.minestom.server.network; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.packet.client.handler.ClientLoginPacketsHandler; -import fr.themode.minestom.net.packet.client.handler.ClientPlayPacketsHandler; -import fr.themode.minestom.net.packet.client.handler.ClientStatusPacketsHandler; -import fr.themode.minestom.net.packet.client.handshake.HandshakePacket; -import fr.themode.minestom.net.player.PlayerConnection; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.packet.client.handler.ClientLoginPacketsHandler; +import net.minestom.server.network.packet.client.handler.ClientPlayPacketsHandler; +import net.minestom.server.network.packet.client.handler.ClientStatusPacketsHandler; +import net.minestom.server.network.packet.client.handshake.HandshakePacket; +import net.minestom.server.network.player.PlayerConnection; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/net/PacketWriterUtils.java b/src/main/java/net/minestom/server/network/PacketWriterUtils.java similarity index 80% rename from src/main/java/fr/themode/minestom/net/PacketWriterUtils.java rename to src/main/java/net/minestom/server/network/PacketWriterUtils.java index 1da7a13f8..a1f735a28 100644 --- a/src/main/java/fr/themode/minestom/net/PacketWriterUtils.java +++ b/src/main/java/net/minestom/server/network/PacketWriterUtils.java @@ -1,12 +1,12 @@ -package fr.themode.minestom.net; +package net.minestom.server.network; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.utils.PacketUtils; -import fr.themode.minestom.utils.thread.MinestomThread; import io.netty.buffer.ByteBuf; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.utils.PacketUtils; +import net.minestom.server.utils.thread.MinestomThread; import java.util.Collection; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/fr/themode/minestom/net/netty/NettyServer.java b/src/main/java/net/minestom/server/network/netty/NettyServer.java similarity index 89% rename from src/main/java/fr/themode/minestom/net/netty/NettyServer.java rename to src/main/java/net/minestom/server/network/netty/NettyServer.java index 0398215bd..101961212 100644 --- a/src/main/java/fr/themode/minestom/net/netty/NettyServer.java +++ b/src/main/java/net/minestom/server/network/netty/NettyServer.java @@ -1,8 +1,5 @@ -package fr.themode.minestom.net.netty; +package net.minestom.server.network.netty; -import fr.themode.minestom.net.PacketProcessor; -import fr.themode.minestom.net.netty.channel.ClientChannel; -import fr.themode.minestom.net.netty.channel.NettyDecoder; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; @@ -10,6 +7,9 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; +import net.minestom.server.network.PacketProcessor; +import net.minestom.server.network.netty.channel.ClientChannel; +import net.minestom.server.network.netty.channel.NettyDecoder; import java.net.InetSocketAddress; diff --git a/src/main/java/fr/themode/minestom/net/netty/channel/ClientChannel.java b/src/main/java/net/minestom/server/network/netty/channel/ClientChannel.java similarity index 80% rename from src/main/java/fr/themode/minestom/net/netty/channel/ClientChannel.java rename to src/main/java/net/minestom/server/network/netty/channel/ClientChannel.java index 2d19822fd..a919c40a8 100644 --- a/src/main/java/fr/themode/minestom/net/netty/channel/ClientChannel.java +++ b/src/main/java/net/minestom/server/network/netty/channel/ClientChannel.java @@ -1,17 +1,17 @@ -package fr.themode.minestom.net.netty.channel; +package net.minestom.server.network.netty.channel; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.PacketProcessor; -import fr.themode.minestom.net.netty.packet.PacketHandler; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.status.LegacyServerListPingPacket; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.utils.Utils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Player; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.PacketProcessor; +import net.minestom.server.network.netty.packet.PacketHandler; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.status.LegacyServerListPingPacket; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.utils.Utils; public class ClientChannel extends ChannelInboundHandlerAdapter { diff --git a/src/main/java/fr/themode/minestom/net/netty/channel/NettyDecoder.java b/src/main/java/net/minestom/server/network/netty/channel/NettyDecoder.java similarity index 90% rename from src/main/java/fr/themode/minestom/net/netty/channel/NettyDecoder.java rename to src/main/java/net/minestom/server/network/netty/channel/NettyDecoder.java index 6bea8188e..868dfb8d3 100644 --- a/src/main/java/fr/themode/minestom/net/netty/channel/NettyDecoder.java +++ b/src/main/java/net/minestom/server/network/netty/channel/NettyDecoder.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.netty.channel; +package net.minestom.server.network.netty.channel; -import fr.themode.minestom.net.netty.packet.PacketHandler; -import fr.themode.minestom.utils.Utils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; +import net.minestom.server.network.netty.packet.PacketHandler; +import net.minestom.server.utils.Utils; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/net/netty/packet/PacketHandler.java b/src/main/java/net/minestom/server/network/netty/packet/PacketHandler.java similarity index 70% rename from src/main/java/fr/themode/minestom/net/netty/packet/PacketHandler.java rename to src/main/java/net/minestom/server/network/netty/packet/PacketHandler.java index 3fbfc760e..f5816c0ca 100644 --- a/src/main/java/fr/themode/minestom/net/netty/packet/PacketHandler.java +++ b/src/main/java/net/minestom/server/network/netty/packet/PacketHandler.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.net.netty.packet; +package net.minestom.server.network.netty.packet; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/fr/themode/minestom/net/packet/PacketReader.java b/src/main/java/net/minestom/server/network/packet/PacketReader.java similarity index 90% rename from src/main/java/fr/themode/minestom/net/packet/PacketReader.java rename to src/main/java/net/minestom/server/network/packet/PacketReader.java index aec6a9438..4b54871e5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/PacketReader.java +++ b/src/main/java/net/minestom/server/network/packet/PacketReader.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet; +package net.minestom.server.network.packet; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.SerializerUtils; -import fr.themode.minestom.utils.Utils; import io.netty.buffer.ByteBuf; +import net.minestom.server.item.ItemStack; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.SerializerUtils; +import net.minestom.server.utils.Utils; public class PacketReader { diff --git a/src/main/java/fr/themode/minestom/net/packet/PacketWriter.java b/src/main/java/net/minestom/server/network/packet/PacketWriter.java similarity index 93% rename from src/main/java/fr/themode/minestom/net/packet/PacketWriter.java rename to src/main/java/net/minestom/server/network/packet/PacketWriter.java index 18ff96e77..e8204a686 100644 --- a/src/main/java/fr/themode/minestom/net/packet/PacketWriter.java +++ b/src/main/java/net/minestom/server/network/packet/PacketWriter.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet; +package net.minestom.server.network.packet; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.SerializerUtils; -import fr.themode.minestom.utils.Utils; -import fr.themode.minestom.utils.buffer.BufferWrapper; +import net.minestom.server.item.ItemStack; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.SerializerUtils; +import net.minestom.server.utils.Utils; +import net.minestom.server.utils.buffer.BufferWrapper; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/minestom/server/network/packet/client/ClientPacket.java b/src/main/java/net/minestom/server/network/packet/client/ClientPacket.java new file mode 100644 index 000000000..9b62dee5e --- /dev/null +++ b/src/main/java/net/minestom/server/network/packet/client/ClientPacket.java @@ -0,0 +1,9 @@ +package net.minestom.server.network.packet.client; + +import net.minestom.server.network.packet.PacketReader; + +public interface ClientPacket { + + void read(PacketReader reader); + +} diff --git a/src/main/java/fr/themode/minestom/net/packet/client/ClientPlayPacket.java b/src/main/java/net/minestom/server/network/packet/client/ClientPlayPacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/client/ClientPlayPacket.java rename to src/main/java/net/minestom/server/network/packet/client/ClientPlayPacket.java index dfe99476b..15f513969 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/ClientPlayPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/ClientPlayPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client; +package net.minestom.server.network.packet.client; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Player; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Player; public abstract class ClientPlayPacket implements ClientPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java b/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java new file mode 100644 index 000000000..cfdc505f1 --- /dev/null +++ b/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java @@ -0,0 +1,11 @@ +package net.minestom.server.network.packet.client; + +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.player.PlayerConnection; + +public interface ClientPreplayPacket extends ClientPacket { + + + void process(PlayerConnection connection, ConnectionManager connectionManager); + +} diff --git a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientLoginPacketsHandler.java b/src/main/java/net/minestom/server/network/packet/client/handler/ClientLoginPacketsHandler.java similarity index 56% rename from src/main/java/fr/themode/minestom/net/packet/client/handler/ClientLoginPacketsHandler.java rename to src/main/java/net/minestom/server/network/packet/client/handler/ClientLoginPacketsHandler.java index f222da5c4..ac20b36b4 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientLoginPacketsHandler.java +++ b/src/main/java/net/minestom/server/network/packet/client/handler/ClientLoginPacketsHandler.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.net.packet.client.handler; +package net.minestom.server.network.packet.client.handler; -import fr.themode.minestom.net.packet.client.login.LoginStartPacket; +import net.minestom.server.network.packet.client.login.LoginStartPacket; public class ClientLoginPacketsHandler extends ClientPacketsHandler { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPacketsHandler.java b/src/main/java/net/minestom/server/network/packet/client/handler/ClientPacketsHandler.java similarity index 89% rename from src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPacketsHandler.java rename to src/main/java/net/minestom/server/network/packet/client/handler/ClientPacketsHandler.java index 5cfd7206a..f8c138866 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPacketsHandler.java +++ b/src/main/java/net/minestom/server/network/packet/client/handler/ClientPacketsHandler.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.handler; +package net.minestom.server.network.packet.client.handler; import com.esotericsoftware.reflectasm.ConstructorAccess; -import fr.themode.minestom.net.packet.client.ClientPacket; +import net.minestom.server.network.packet.client.ClientPacket; public class ClientPacketsHandler { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPlayPacketsHandler.java b/src/main/java/net/minestom/server/network/packet/client/handler/ClientPlayPacketsHandler.java similarity index 95% rename from src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPlayPacketsHandler.java rename to src/main/java/net/minestom/server/network/packet/client/handler/ClientPlayPacketsHandler.java index 641532ee9..2e5e29915 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientPlayPacketsHandler.java +++ b/src/main/java/net/minestom/server/network/packet/client/handler/ClientPlayPacketsHandler.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.net.packet.client.handler; +package net.minestom.server.network.packet.client.handler; -import fr.themode.minestom.net.packet.client.play.*; +import net.minestom.server.network.packet.client.play.*; public class ClientPlayPacketsHandler extends ClientPacketsHandler { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientStatusPacketsHandler.java b/src/main/java/net/minestom/server/network/packet/client/handler/ClientStatusPacketsHandler.java similarity index 51% rename from src/main/java/fr/themode/minestom/net/packet/client/handler/ClientStatusPacketsHandler.java rename to src/main/java/net/minestom/server/network/packet/client/handler/ClientStatusPacketsHandler.java index 241a9afcb..0bdb770af 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/handler/ClientStatusPacketsHandler.java +++ b/src/main/java/net/minestom/server/network/packet/client/handler/ClientStatusPacketsHandler.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.handler; +package net.minestom.server.network.packet.client.handler; -import fr.themode.minestom.net.packet.client.status.PingPacket; -import fr.themode.minestom.net.packet.client.status.StatusRequestPacket; +import net.minestom.server.network.packet.client.status.PingPacket; +import net.minestom.server.network.packet.client.status.StatusRequestPacket; public class ClientStatusPacketsHandler extends ClientPacketsHandler { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/handshake/HandshakePacket.java b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java similarity index 72% rename from src/main/java/fr/themode/minestom/net/packet/client/handshake/HandshakePacket.java rename to src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java index 4b52f0eca..b04a9722d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/handshake/HandshakePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet.client.handshake; +package net.minestom.server.network.packet.client.handshake; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.ConnectionState; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.ConnectionState; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.player.PlayerConnection; public class HandshakePacket implements ClientPreplayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/login/LoginStartPacket.java b/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java similarity index 86% rename from src/main/java/fr/themode/minestom/net/packet/client/login/LoginStartPacket.java rename to src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java index 3d1861030..de49de6af 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/login/LoginStartPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java @@ -1,21 +1,21 @@ -package fr.themode.minestom.net.packet.client.login; +package net.minestom.server.network.packet.client.login; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.command.CommandManager; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.ConnectionState; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.packet.server.login.JoinGamePacket; -import fr.themode.minestom.net.packet.server.login.LoginSuccessPacket; -import fr.themode.minestom.net.packet.server.play.*; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.recipe.Recipe; -import fr.themode.minestom.recipe.RecipeManager; -import fr.themode.minestom.world.Dimension; -import fr.themode.minestom.world.LevelType; +import net.minestom.server.MinecraftServer; +import net.minestom.server.command.CommandManager; +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.ConnectionState; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.packet.server.login.JoinGamePacket; +import net.minestom.server.network.packet.server.login.LoginSuccessPacket; +import net.minestom.server.network.packet.server.play.*; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.recipe.Recipe; +import net.minestom.server.recipe.RecipeManager; +import net.minestom.server.world.Dimension; +import net.minestom.server.world.LevelType; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientAdvancementTabPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientAdvancementTabPacket.java similarity index 71% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientAdvancementTabPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientAdvancementTabPacket.java index 8f663cec2..c40f62c44 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientAdvancementTabPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientAdvancementTabPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientAdvancementTabPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientAnimationPacket.java similarity index 50% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientAnimationPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientAnimationPacket.java index 0e463972e..4c5eda5aa 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientAnimationPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientAnimationPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientChatMessagePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientChatMessagePacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientChatMessagePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientChatMessagePacket.java index 585bedaa7..eb1467e8d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientChatMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientChatMessagePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientChatMessagePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowButtonPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowButtonPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowButtonPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowButtonPacket.java index 01c93d890..d0de8ab10 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowButtonPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowButtonPacket.java @@ -1,16 +1,16 @@ -package fr.themode.minestom.net.packet.client.play; - -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; - -public class ClientClickWindowButtonPacket extends ClientPlayPacket { - - public byte windowId; - public byte buttonId; - - @Override - public void read(PacketReader reader) { - this.windowId = reader.readByte(); - this.buttonId = reader.readByte(); - } -} +package net.minestom.server.network.packet.client.play; + +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; + +public class ClientClickWindowButtonPacket extends ClientPlayPacket { + + public byte windowId; + public byte buttonId; + + @Override + public void read(PacketReader reader) { + this.windowId = reader.readByte(); + this.buttonId = reader.readByte(); + } +} diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowPacket.java similarity index 70% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowPacket.java index 5fa3fea39..1d094337b 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientClickWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientClickWindowPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientClickWindowPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCloseWindow.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientCloseWindow.java similarity index 52% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientCloseWindow.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientCloseWindow.java index deb804387..7798eeeea 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCloseWindow.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientCloseWindow.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientCloseWindow extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCraftRecipeRequest.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientCraftRecipeRequest.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientCraftRecipeRequest.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientCraftRecipeRequest.java index ef2b97609..b19517993 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCraftRecipeRequest.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientCraftRecipeRequest.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientCraftRecipeRequest extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCreativeInventoryActionPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientCreativeInventoryActionPacket.java similarity index 55% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientCreativeInventoryActionPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientCreativeInventoryActionPacket.java index 0b7dfaa4b..6f5783b9f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientCreativeInventoryActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientCreativeInventoryActionPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientCreativeInventoryActionPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientEntityActionPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientEntityActionPacket.java similarity index 77% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientEntityActionPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientEntityActionPacket.java index 759f106d2..2008b996c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientEntityActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientEntityActionPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientEntityActionPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientHeldItemChangePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientHeldItemChangePacket.java similarity index 52% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientHeldItemChangePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientHeldItemChangePacket.java index 856427f1a..8120cdd66 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientHeldItemChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientHeldItemChangePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientHeldItemChangePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientInteractEntityPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientInteractEntityPacket.java similarity index 80% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientInteractEntityPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientInteractEntityPacket.java index 7d9f62e86..cd4c3ca48 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientInteractEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientInteractEntityPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientInteractEntityPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientKeepAlivePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientKeepAlivePacket.java similarity index 51% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientKeepAlivePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientKeepAlivePacket.java index 2889ccf8b..0f848d2e6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientKeepAlivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientKeepAlivePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientKeepAlivePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientNameItemPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientNameItemPacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientNameItemPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientNameItemPacket.java index 7f99ba162..caf6774f2 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientNameItemPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientNameItemPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientNameItemPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPickItemPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPickItemPacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPickItemPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPickItemPacket.java index 229105c38..f0c575bf7 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPickItemPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPickItemPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPickItemPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerAbilitiesPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerAbilitiesPacket.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerAbilitiesPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerAbilitiesPacket.java index 3732545a7..771b061f5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerAbilitiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerAbilitiesPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPlayerAbilitiesPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerBlockPlacementPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java similarity index 74% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerBlockPlacementPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java index b8b37cb25..7fca09ce3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerBlockPlacementPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.utils.BlockPosition; public class ClientPlayerBlockPlacementPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerDiggingPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java similarity index 76% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerDiggingPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java index 61bf17d95..6d14c685e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerDiggingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.utils.BlockPosition; public class ClientPlayerDiggingPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerLookPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerLookPacket.java similarity index 63% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerLookPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerLookPacket.java index 62f6fb183..135865d20 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerLookPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPlayerLookPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPacket.java index 019cb4a8c..fcc0bdd2f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPlayerPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionAndLookPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionAndLookPacket.java similarity index 72% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionAndLookPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionAndLookPacket.java index 2d30dd1cc..26e6a7d81 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionAndLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionAndLookPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPlayerPositionAndLookPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionPacket.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionPacket.java index b4d9de438..1a02e3555 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPlayerPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerPositionPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPlayerPositionPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPluginMessagePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPluginMessagePacket.java similarity index 61% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientPluginMessagePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientPluginMessagePacket.java index 9166f5a46..df923aaf6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientPluginMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPluginMessagePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientPluginMessagePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientRecipeBookData.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientRecipeBookData.java similarity index 88% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientRecipeBookData.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientRecipeBookData.java index b673e43a1..14ce2f32d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientRecipeBookData.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientRecipeBookData.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientRecipeBookData extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientResourcePackStatusPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientResourcePackStatusPacket.java similarity index 63% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientResourcePackStatusPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientResourcePackStatusPacket.java index 440be3cbd..dab9753da 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientResourcePackStatusPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientResourcePackStatusPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientResourcePackStatusPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSelectTradePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientSelectTradePacket.java similarity index 54% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientSelectTradePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientSelectTradePacket.java index 093fac498..c93e077f3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSelectTradePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientSelectTradePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientSelectTradePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSettingsPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientSettingsPacket.java similarity index 75% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientSettingsPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientSettingsPacket.java index 761384f3c..df0d81dc3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSettingsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientSettingsPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientSettingsPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSpectatePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientSpectatePacket.java similarity index 54% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientSpectatePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientSpectatePacket.java index 205102720..8408ec6e9 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSpectatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientSpectatePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientStatusPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientStatusPacket.java similarity index 62% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientStatusPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientStatusPacket.java index bfc97a16e..f2b0b8ec7 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientStatusPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientStatusPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientStatusPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerBoatPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientSteerBoatPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerBoatPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientSteerBoatPacket.java index 4223fce85..272693471 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerBoatPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientSteerBoatPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientSteerBoatPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerVehiclePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientSteerVehiclePacket.java similarity index 65% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerVehiclePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientSteerVehiclePacket.java index aa04a9800..66742a4b2 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientSteerVehiclePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientSteerVehiclePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientSteerVehiclePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientTabCompletePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientTabCompletePacket.java similarity index 61% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientTabCompletePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientTabCompletePacket.java index d10a728cb..f92d6c25b 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientTabCompletePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientTabCompletePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientTabCompletePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientTeleportConfirmPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientTeleportConfirmPacket.java similarity index 54% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientTeleportConfirmPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientTeleportConfirmPacket.java index 036e40f28..5f485b6c5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientTeleportConfirmPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientTeleportConfirmPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientTeleportConfirmPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java similarity index 67% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java index ca85824a1..35fd7cae0 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockMinecartPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientUpdateCommandBlockMinecartPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java similarity index 69% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java index 5a4fe7beb..23ea4f86e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateCommandBlockPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.utils.BlockPosition; public class ClientUpdateCommandBlockPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateSignPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java similarity index 69% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateSignPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java index 289af5c6c..2c4e00e0a 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUpdateSignPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; +import net.minestom.server.utils.BlockPosition; public class ClientUpdateSignPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUseItemPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUseItemPacket.java similarity index 50% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientUseItemPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientUseItemPacket.java index 48f4bb23b..62cede393 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientUseItemPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUseItemPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientUseItemPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientVehicleMovePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientVehicleMovePacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientVehicleMovePacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientVehicleMovePacket.java index 1aba09d36..6f9a2e62e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientVehicleMovePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientVehicleMovePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientVehicleMovePacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientWindowConfirmationPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientWindowConfirmationPacket.java similarity index 67% rename from src/main/java/fr/themode/minestom/net/packet/client/play/ClientWindowConfirmationPacket.java rename to src/main/java/net/minestom/server/network/packet/client/play/ClientWindowConfirmationPacket.java index c43f293a7..3a3c20af3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/play/ClientWindowConfirmationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientWindowConfirmationPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.client.play; +package net.minestom.server.network.packet.client.play; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPlayPacket; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPlayPacket; public class ClientWindowConfirmationPacket extends ClientPlayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/status/LegacyServerListPingPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java similarity index 52% rename from src/main/java/fr/themode/minestom/net/packet/client/status/LegacyServerListPingPacket.java rename to src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java index 3b571f85b..79966bf5e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/status/LegacyServerListPingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.client.status; +package net.minestom.server.network.packet.client.status; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.player.PlayerConnection; public class LegacyServerListPingPacket implements ClientPreplayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/status/PingPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java similarity index 54% rename from src/main/java/fr/themode/minestom/net/packet/client/status/PingPacket.java rename to src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java index cfa2823b5..6ae85441e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/status/PingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet.client.status; +package net.minestom.server.network.packet.client.status; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.packet.server.status.PongPacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.packet.server.status.PongPacket; +import net.minestom.server.network.player.PlayerConnection; public class PingPacket implements ClientPreplayPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/client/status/StatusRequestPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/client/status/StatusRequestPacket.java rename to src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java index e50de6532..0d60fb41e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/client/status/StatusRequestPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java @@ -1,13 +1,13 @@ -package fr.themode.minestom.net.packet.client.status; +package net.minestom.server.network.packet.client.status; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.net.ConnectionManager; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.client.ClientPreplayPacket; -import fr.themode.minestom.net.packet.server.handshake.ResponsePacket; -import fr.themode.minestom.net.player.PlayerConnection; -import fr.themode.minestom.ping.ResponseData; -import fr.themode.minestom.ping.ResponseDataConsumer; +import net.minestom.server.MinecraftServer; +import net.minestom.server.network.ConnectionManager; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.client.ClientPreplayPacket; +import net.minestom.server.network.packet.server.handshake.ResponsePacket; +import net.minestom.server.network.player.PlayerConnection; +import net.minestom.server.ping.ResponseData; +import net.minestom.server.ping.ResponseDataConsumer; public class StatusRequestPacket implements ClientPreplayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java new file mode 100644 index 000000000..e3771d1c4 --- /dev/null +++ b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java @@ -0,0 +1,11 @@ +package net.minestom.server.network.packet.server; + +import net.minestom.server.network.packet.PacketWriter; + +public interface ServerPacket { + + void write(PacketWriter writer); + + int getId(); + +} diff --git a/src/main/java/fr/themode/minestom/net/packet/server/ServerPacketIdentifier.java b/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java similarity index 98% rename from src/main/java/fr/themode/minestom/net/packet/server/ServerPacketIdentifier.java rename to src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java index 454bf0988..cd954437b 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/ServerPacketIdentifier.java +++ b/src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.net.packet.server; +package net.minestom.server.network.packet.server; public class ServerPacketIdentifier { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/handshake/ResponsePacket.java b/src/main/java/net/minestom/server/network/packet/server/handshake/ResponsePacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/handshake/ResponsePacket.java rename to src/main/java/net/minestom/server/network/packet/server/handshake/ResponsePacket.java index ee18fb20d..930f5d630 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/handshake/ResponsePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/handshake/ResponsePacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.server.handshake; +package net.minestom.server.network.packet.server.handshake; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; public class ResponsePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/login/JoinGamePacket.java b/src/main/java/net/minestom/server/network/packet/server/login/JoinGamePacket.java similarity index 73% rename from src/main/java/fr/themode/minestom/net/packet/server/login/JoinGamePacket.java rename to src/main/java/net/minestom/server/network/packet/server/login/JoinGamePacket.java index dc311a60e..fc07933c3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/login/JoinGamePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/JoinGamePacket.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.net.packet.server.login; +package net.minestom.server.network.packet.server.login; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.world.Dimension; -import fr.themode.minestom.world.LevelType; +import net.minestom.server.entity.GameMode; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.world.Dimension; +import net.minestom.server.world.LevelType; public class JoinGamePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/login/LoginSuccessPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java similarity index 78% rename from src/main/java/fr/themode/minestom/net/packet/server/login/LoginSuccessPacket.java rename to src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java index e94a6e876..700a1b9a7 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/login/LoginSuccessPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.server.login; +package net.minestom.server.network.packet.server.login; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/AcknowledgePlayerDiggingPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/AcknowledgePlayerDiggingPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java index 500052b3c..8abb2bf56 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/AcknowledgePlayerDiggingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.client.play.ClientPlayerDiggingPacket; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class AcknowledgePlayerDiggingPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/AdvancementsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java similarity index 92% rename from src/main/java/fr/themode/minestom/net/packet/server/play/AdvancementsPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java index a859226ef..6081869f3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/AdvancementsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.chat.Chat; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class AdvancementsPacket implements ServerPacket { @@ -36,7 +36,7 @@ public class AdvancementsPacket implements ServerPacket { } public enum FrameType { - TASK, CHALLENGE, GOAL; + TASK, CHALLENGE, GOAL } public static class AdvancementMapping { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/AttachEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java similarity index 61% rename from src/main/java/fr/themode/minestom/net/packet/server/play/AttachEntityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java index 22c3ab3a8..51c6525f6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/AttachEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class AttachEntityPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockActionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java similarity index 63% rename from src/main/java/fr/themode/minestom/net/packet/server/play/BlockActionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java index 9ffd7366e..e79ef1af0 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class BlockActionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockBreakAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/BlockBreakAnimationPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java index a7c8b0292..0ff8dfc16 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockBreakAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class BlockBreakAnimationPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java similarity index 56% rename from src/main/java/fr/themode/minestom/net/packet/server/play/BlockChangePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java index c5d77202a..c3af2a335 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/BlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class BlockChangePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/BossBarPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java similarity index 79% rename from src/main/java/fr/themode/minestom/net/packet/server/play/BossBarPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java index 16c1a1dfb..78cdb1840 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/BossBarPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.bossbar.BarColor; -import fr.themode.minestom.bossbar.BarDivision; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.bossbar.BarColor; +import net.minestom.server.bossbar.BarDivision; +import net.minestom.server.chat.Chat; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; import java.util.UUID; @@ -64,7 +64,7 @@ public class BossBarPacket implements ServerPacket { UPDATE_HEALTH, UPDATE_TITLE, UPDATE_STYLE, - UPDATE_FLAGS; + UPDATE_FLAGS } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/CameraPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java similarity index 52% rename from src/main/java/fr/themode/minestom/net/packet/server/play/CameraPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java index 25a574fad..3253e82f2 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/CameraPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class CameraPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ChangeGameStatePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java similarity index 71% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ChangeGameStatePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java index 7d85b706c..25d7963ca 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ChangeGameStatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ChangeGameStatePacket implements ServerPacket { @@ -32,7 +32,7 @@ public class ChangeGameStatePacket implements ServerPacket { FADE_TIME, PLAY_PUFFERFISH_STING_SOUND, PLAYER_ELDER_GUARDIAN_MOB_APPEARANCE, - ENABLE_RESPAWN_SCREEN; + ENABLE_RESPAWN_SCREEN } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ChatMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java similarity index 69% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ChatMessagePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java index 1a117dfda..1e2b9d59c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ChatMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ChatMessagePacket implements ServerPacket { @@ -29,6 +29,6 @@ public class ChatMessagePacket implements ServerPacket { CHAT, SYSTEM_MESSAGE, - GAME_INFO; + GAME_INFO } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ChunkDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java similarity index 89% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ChunkDataPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java index 086662729..58c309454 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ChunkDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java @@ -1,14 +1,14 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; -import fr.themode.minestom.utils.SerializerUtils; -import fr.themode.minestom.utils.Utils; -import fr.themode.minestom.utils.buffer.BufferUtils; -import fr.themode.minestom.utils.buffer.BufferWrapper; +import net.minestom.server.instance.Chunk; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; +import net.minestom.server.utils.SerializerUtils; +import net.minestom.server.utils.Utils; +import net.minestom.server.utils.buffer.BufferUtils; +import net.minestom.server.utils.buffer.BufferWrapper; import net.querz.nbt.CompoundTag; import net.querz.nbt.DoubleTag; import net.querz.nbt.LongArrayTag; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/CloseWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/server/play/CloseWindowPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java index b8646fd54..9588abcb9 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/CloseWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class CloseWindowPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/CollectItemPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java similarity index 65% rename from src/main/java/fr/themode/minestom/net/packet/server/play/CollectItemPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java index e5cedff5d..e356d8695 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/CollectItemPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class CollectItemPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ConfirmTransactionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ConfirmTransactionPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ConfirmTransactionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ConfirmTransactionPacket.java index 5323c0683..d1d43c018 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ConfirmTransactionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ConfirmTransactionPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ConfirmTransactionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/CraftRecipeResponse.java b/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java similarity index 59% rename from src/main/java/fr/themode/minestom/net/packet/server/play/CraftRecipeResponse.java rename to src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java index a54493cb0..3e7ab7a81 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/CraftRecipeResponse.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class CraftRecipeResponse implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/DeclareCommandsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java similarity index 87% rename from src/main/java/fr/themode/minestom/net/packet/server/play/DeclareCommandsPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java index fe36949db..1b8915d22 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/DeclareCommandsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/DeclareRecipesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java similarity index 90% rename from src/main/java/fr/themode/minestom/net/packet/server/play/DeclareRecipesPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java index 73de65010..50c182e84 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/DeclareRecipesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class DeclareRecipesPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/DestroyEntitiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java similarity index 55% rename from src/main/java/fr/themode/minestom/net/packet/server/play/DestroyEntitiesPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java index 37d3cb45e..da2e90274 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/DestroyEntitiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class DestroyEntitiesPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/DisconnectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DisconnectPacket.java similarity index 52% rename from src/main/java/fr/themode/minestom/net/packet/server/play/DisconnectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/DisconnectPacket.java index 02ecbb1ab..1ab8f6866 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/DisconnectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DisconnectPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.chat.Chat; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class DisconnectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/DisplayScoreboardPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/DisplayScoreboardPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java index 333183a91..6d9ccf5cd 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/DisplayScoreboardPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class DisplayScoreboardPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java similarity index 62% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EffectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java index 91bb8475e..8616422d4 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class EffectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java similarity index 65% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityAnimationPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java index 3aebfc733..39c1ae498 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityAnimationPacket implements ServerPacket { @@ -26,6 +26,6 @@ public class EntityAnimationPacket implements ServerPacket { LEAVE_BED, SWING_OFF_HAND, CRITICAL_EFFECT, - MAGICAL_CRITICAL_EFFECT; + MAGICAL_CRITICAL_EFFECT } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityEffectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java index f5b737c86..a739045e6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityEffectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityEquipmentPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityEquipmentPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java index 1db9c720c..612c439dc 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityEquipmentPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityEquipmentPacket implements ServerPacket { @@ -29,7 +29,7 @@ public class EntityEquipmentPacket implements ServerPacket { BOOTS, LEGGINGS, CHESTPLATE, - HELMET; + HELMET } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityHeadLookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityHeadLookPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java index 8fbd7758c..2273b21b6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityHeadLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityHeadLookPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityMetaDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityMetaDataPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java index c939eb061..61b39a8d3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityMetaDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityPacket.java index 10d1495d9..c19eb9e34 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionAndRotationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java similarity index 72% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionAndRotationPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java index 42f1e5486..afb3eaa4a 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionAndRotationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityPositionAndRotationPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java similarity index 67% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java index 6e2fa9d38..673f7ab53 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityPositionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPropertiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java similarity index 75% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityPropertiesPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java index 76329537d..bb881f4cd 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityPropertiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityPropertiesPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityRotationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityRotationPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java index 96c336666..b28aec6c4 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityRotationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityRotationPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntitySoundEffect.java b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffect.java similarity index 65% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntitySoundEffect.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffect.java index 04167278d..892a90606 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntitySoundEffect.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffect.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.sound.SoundCategory; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.sound.SoundCategory; public class EntitySoundEffect implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityStatusPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityStatusPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java index a7677db47..6ef067543 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityStatusPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityStatusPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityTeleportPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java similarity index 69% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityTeleportPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java index 106a9516d..feda469f5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityTeleportPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; public class EntityTeleportPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityVelocityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/EntityVelocityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java index 14324b28d..6cb626de8 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/EntityVelocityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class EntityVelocityPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ExplosionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java similarity index 74% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ExplosionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java index e48422ea2..3cd07e8f7 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ExplosionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ExplosionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/FacePlayerPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java similarity index 74% rename from src/main/java/fr/themode/minestom/net/packet/server/play/FacePlayerPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java index 33c9382b1..4f48655a1 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/FacePlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class FacePlayerPacket implements ServerPacket { @@ -33,7 +33,7 @@ public class FacePlayerPacket implements ServerPacket { } public enum FacePosition { - FEET, EYES; + FEET, EYES } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/HeldItemChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java similarity index 53% rename from src/main/java/fr/themode/minestom/net/packet/server/play/HeldItemChangePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java index 5ea80debb..44ce887b5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/HeldItemChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class HeldItemChangePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/KeepAlivePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/KeepAlivePacket.java similarity index 57% rename from src/main/java/fr/themode/minestom/net/packet/server/play/KeepAlivePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/KeepAlivePacket.java index f32c0a1d8..b82df3a99 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/KeepAlivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/KeepAlivePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class KeepAlivePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/MultiBlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java similarity index 80% rename from src/main/java/fr/themode/minestom/net/packet/server/play/MultiBlockChangePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java index 2aff93fbf..ce934510a 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/MultiBlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class MultiBlockChangePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/NamedSoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/server/play/NamedSoundEffectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java index a34513893..b7203c533 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/NamedSoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.sound.SoundCategory; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.sound.SoundCategory; public class NamedSoundEffectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenBookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java similarity index 50% rename from src/main/java/fr/themode/minestom/net/packet/server/play/OpenBookPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java index 6c0f66b6d..4f8fa2396 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenBookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class OpenBookPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenHorseWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java similarity index 62% rename from src/main/java/fr/themode/minestom/net/packet/server/play/OpenHorseWindowPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java index b5deae86d..50f40fbd3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenHorseWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class OpenHorseWindowPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenSignEditorPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/server/play/OpenSignEditorPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java index 4ba98ea74..61a4373b6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenSignEditorPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; public class OpenSignEditorPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/OpenWindowPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java index 21a093eaa..f139a1301 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/OpenWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class OpenWindowPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ParticlePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java similarity index 79% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ParticlePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java index 14ed60390..1ea10ea3d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ParticlePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerAbilitiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java similarity index 76% rename from src/main/java/fr/themode/minestom/net/packet/server/play/PlayerAbilitiesPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java index 8d38709f7..d9da009e6 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerAbilitiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class PlayerAbilitiesPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerInfoPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoPacket.java similarity index 93% rename from src/main/java/fr/themode/minestom/net/packet/server/play/PlayerInfoPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoPacket.java index 9df52d02c..4bc8fa098 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerInfoPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.entity.GameMode; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerListHeaderAndFooterPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java similarity index 75% rename from src/main/java/fr/themode/minestom/net/packet/server/play/PlayerListHeaderAndFooterPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java index 225bb9ee8..b75ebe0ac 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerListHeaderAndFooterPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class PlayerListHeaderAndFooterPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerPositionAndLookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/server/play/PlayerPositionAndLookPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java index 5df9a76f9..e8ed712c3 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/PlayerPositionAndLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; public class PlayerPositionAndLookPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/PluginMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/server/play/PluginMessagePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java index fedc923f3..bb9f626a8 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/PluginMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class PluginMessagePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/RemoveEntityEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java similarity index 59% rename from src/main/java/fr/themode/minestom/net/packet/server/play/RemoveEntityEffectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java index 8628fb47b..379d9ddd1 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/RemoveEntityEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class RemoveEntityEffectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ResourcePackSendPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ResourcePackSendPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java index 72a61fdf6..9b35a58b2 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ResourcePackSendPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ResourcePackSendPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/RespawnPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java similarity index 51% rename from src/main/java/fr/themode/minestom/net/packet/server/play/RespawnPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java index 7f0c18b5a..2c29ac9b9 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/RespawnPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.entity.GameMode; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.world.Dimension; -import fr.themode.minestom.world.LevelType; +import net.minestom.server.entity.GameMode; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.world.Dimension; +import net.minestom.server.world.LevelType; public class RespawnPacket implements ServerPacket { @@ -18,7 +18,7 @@ public class RespawnPacket implements ServerPacket { public void write(PacketWriter writer) { writer.writeInt(dimension.getId()); writer.writeLong(hashedSeed); - writer.writeByte((byte) gameMode.getId()); // Hardcore flag not included + writer.writeByte(gameMode.getId()); // Hardcore flag not included writer.writeSizedString(levelType.getType()); } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ScoreboardObjectivePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java similarity index 67% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ScoreboardObjectivePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java index 9db7146c8..6ce6b0c56 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ScoreboardObjectivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.chat.Chat; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class ScoreboardObjectivePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/ServerDifficultyPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java similarity index 57% rename from src/main/java/fr/themode/minestom/net/packet/server/play/ServerDifficultyPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java index 6344a6ce3..10a819e3e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/ServerDifficultyPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.world.Difficulty; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.world.Difficulty; public class ServerDifficultyPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SetCooldownPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java similarity index 59% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SetCooldownPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java index 2f11203eb..b6b967035 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SetCooldownPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SetCooldownPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SetExperiencePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java similarity index 63% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SetExperiencePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java index 121a62ba4..c8b62bb4f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SetExperiencePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SetExperiencePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SetPassengersPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SetPassengersPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java index d08fe72ff..c25b1a358 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SetPassengersPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SetPassengersPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SetSlotPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SetSlotPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java index 83dfd37d0..d0513e35f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SetSlotPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SetSlotPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java similarity index 67% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SoundEffectPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java index bc4e647b0..aab548a45 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.sound.SoundCategory; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.sound.SoundCategory; public class SoundEffectPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java similarity index 76% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnEntityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java index 7c425030a..b6ad1ae41 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnExperienceOrbPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnExperienceOrbPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java index 81b1922ce..57d034b56 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnExperienceOrbPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; public class SpawnExperienceOrbPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnLivingEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java similarity index 77% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnLivingEntityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java index 17a549d50..529ff1f5c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnLivingEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPaintingPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPaintingPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java index 284f2f866..d8f4bec7d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPaintingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.BlockPosition; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.BlockPosition; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPlayerPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java similarity index 70% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPlayerPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java index aa0eb65ec..1347e20d8 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.utils.Position; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.Position; import java.util.UUID; diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java similarity index 54% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPositionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java index 942f9d3b3..0a9f7cc3f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SpawnPositionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnWeatherEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnWeatherEntityPacket.java similarity index 65% rename from src/main/java/fr/themode/minestom/net/packet/server/play/SpawnWeatherEntityPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/SpawnWeatherEntityPacket.java index 9cd11b4fe..a926fe721 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/SpawnWeatherEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnWeatherEntityPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class SpawnWeatherEntityPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/StatisticsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java similarity index 71% rename from src/main/java/fr/themode/minestom/net/packet/server/play/StatisticsPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java index f923c22fb..606b4619f 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/StatisticsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; -import fr.themode.minestom.stat.StatisticCategory; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.stat.StatisticCategory; public class StatisticsPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/StopSoundPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java similarity index 66% rename from src/main/java/fr/themode/minestom/net/packet/server/play/StopSoundPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java index 3ae1bf1d3..e13f52383 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/StopSoundPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class StopSoundPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/TabCompletePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java similarity index 77% rename from src/main/java/fr/themode/minestom/net/packet/server/play/TabCompletePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java index 08989fc8a..38f808d2d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/TabCompletePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class TabCompletePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/TeamsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java similarity index 88% rename from src/main/java/fr/themode/minestom/net/packet/server/play/TeamsPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java index 1f71519f1..a2eb77eaf 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/TeamsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.chat.Chat; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class TeamsPacket implements ServerPacket { @@ -56,7 +56,7 @@ public class TeamsPacket implements ServerPacket { REMOVE_TEAM, UPDATE_TEAM_INFO, ADD_PLAYERS_TEAM, - REMOVE_PLAYERS_TEAM; + REMOVE_PLAYERS_TEAM } public enum NameTagVisibility { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/TimeUpdatePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java similarity index 58% rename from src/main/java/fr/themode/minestom/net/packet/server/play/TimeUpdatePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java index 537cc904f..2e8ff9ef0 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/TimeUpdatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class TimeUpdatePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/TitlePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TitlePacket.java similarity index 81% rename from src/main/java/fr/themode/minestom/net/packet/server/play/TitlePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/TitlePacket.java index e71f50a2e..028e86a4e 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/TitlePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TitlePacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.chat.Chat; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class TitlePacket implements ServerPacket { @@ -55,7 +55,7 @@ public class TitlePacket implements ServerPacket { SET_ACTION_BAR, SET_TIMES_AND_DISPLAY, HIDE, - RESET; + RESET } } diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/TradeListPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java similarity index 85% rename from src/main/java/fr/themode/minestom/net/packet/server/play/TradeListPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java index 0373a5265..99865c0b1 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/TradeListPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class TradeListPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UnloadChunkPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java similarity index 56% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UnloadChunkPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java index 55a951636..6d8258456 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UnloadChunkPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UnloadChunkPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UnlockRecipesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java similarity index 82% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UnlockRecipesPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java index 4c3a60de0..92252d51c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UnlockRecipesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UnlockRecipesPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateHealthPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java similarity index 62% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UpdateHealthPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java index dec6f200d..a1fb85d22 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateHealthPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UpdateHealthPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateLightPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java similarity index 78% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UpdateLightPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java index 4a79ed47a..b475375be 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateLightPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UpdateLightPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateScorePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UpdateScorePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java index fd02767b8..88400e55d 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateScorePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UpdateScorePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateViewPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java similarity index 60% rename from src/main/java/fr/themode/minestom/net/packet/server/play/UpdateViewPositionPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java index e24894aee..6ac5c22de 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/UpdateViewPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.instance.Chunk; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class UpdateViewPositionPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/VehicleMovePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/play/VehicleMovePacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java index 5c9c2bd00..aff06e76c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/VehicleMovePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class VehicleMovePacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/WindowItemsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java similarity index 68% rename from src/main/java/fr/themode/minestom/net/packet/server/play/WindowItemsPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java index 35bb0ed6b..ccef22999 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/WindowItemsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class WindowItemsPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/play/WindowPropertyPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java similarity index 62% rename from src/main/java/fr/themode/minestom/net/packet/server/play/WindowPropertyPacket.java rename to src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java index d8cde8f14..de87d49d5 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/play/WindowPropertyPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java @@ -1,8 +1,8 @@ -package fr.themode.minestom.net.packet.server.play; +package net.minestom.server.network.packet.server.play; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.net.packet.server.ServerPacketIdentifier; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.network.packet.server.ServerPacketIdentifier; public class WindowPropertyPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/packet/server/status/PongPacket.java b/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java similarity index 64% rename from src/main/java/fr/themode/minestom/net/packet/server/status/PongPacket.java rename to src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java index 2b25fa217..2b0494d5c 100644 --- a/src/main/java/fr/themode/minestom/net/packet/server/status/PongPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.net.packet.server.status; +package net.minestom.server.network.packet.server.status; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; public class PongPacket implements ServerPacket { diff --git a/src/main/java/fr/themode/minestom/net/player/PlayerConnection.java b/src/main/java/net/minestom/server/network/player/PlayerConnection.java similarity index 87% rename from src/main/java/fr/themode/minestom/net/player/PlayerConnection.java rename to src/main/java/net/minestom/server/network/player/PlayerConnection.java index fc96c53e5..ac9d88dbf 100644 --- a/src/main/java/fr/themode/minestom/net/player/PlayerConnection.java +++ b/src/main/java/net/minestom/server/network/player/PlayerConnection.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.net.player; +package net.minestom.server.network.player; -import fr.themode.minestom.net.ConnectionState; -import fr.themode.minestom.net.packet.server.ServerPacket; -import fr.themode.minestom.utils.PacketUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import net.minestom.server.network.ConnectionState; +import net.minestom.server.network.packet.server.ServerPacket; +import net.minestom.server.utils.PacketUtils; import java.net.SocketAddress; diff --git a/src/main/java/fr/themode/minestom/particle/Particle.java b/src/main/java/net/minestom/server/particle/Particle.java similarity index 97% rename from src/main/java/fr/themode/minestom/particle/Particle.java rename to src/main/java/net/minestom/server/particle/Particle.java index 9337979a6..4fdbacfb3 100644 --- a/src/main/java/fr/themode/minestom/particle/Particle.java +++ b/src/main/java/net/minestom/server/particle/Particle.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.particle; +package net.minestom.server.particle; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/fr/themode/minestom/particle/ParticleCreator.java b/src/main/java/net/minestom/server/particle/ParticleCreator.java similarity index 90% rename from src/main/java/fr/themode/minestom/particle/ParticleCreator.java rename to src/main/java/net/minestom/server/particle/ParticleCreator.java index 0bf1757e8..dec226f22 100644 --- a/src/main/java/fr/themode/minestom/particle/ParticleCreator.java +++ b/src/main/java/net/minestom/server/particle/ParticleCreator.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.particle; +package net.minestom.server.particle; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.play.ParticlePacket; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.play.ParticlePacket; import java.util.function.Consumer; diff --git a/src/main/java/fr/themode/minestom/ping/ResponseData.java b/src/main/java/net/minestom/server/ping/ResponseData.java similarity index 98% rename from src/main/java/fr/themode/minestom/ping/ResponseData.java rename to src/main/java/net/minestom/server/ping/ResponseData.java index 826f17883..2903aaaf1 100644 --- a/src/main/java/fr/themode/minestom/ping/ResponseData.java +++ b/src/main/java/net/minestom/server/ping/ResponseData.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.ping; +package net.minestom.server.ping; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/fr/themode/minestom/ping/ResponseDataConsumer.java b/src/main/java/net/minestom/server/ping/ResponseDataConsumer.java similarity index 60% rename from src/main/java/fr/themode/minestom/ping/ResponseDataConsumer.java rename to src/main/java/net/minestom/server/ping/ResponseDataConsumer.java index 62ecf3ab5..13450b981 100644 --- a/src/main/java/fr/themode/minestom/ping/ResponseDataConsumer.java +++ b/src/main/java/net/minestom/server/ping/ResponseDataConsumer.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.ping; +package net.minestom.server.ping; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.network.player.PlayerConnection; @FunctionalInterface public interface ResponseDataConsumer { diff --git a/src/main/java/fr/themode/minestom/recipe/Recipe.java b/src/main/java/net/minestom/server/recipe/Recipe.java similarity index 88% rename from src/main/java/fr/themode/minestom/recipe/Recipe.java rename to src/main/java/net/minestom/server/recipe/Recipe.java index 0822b452d..086a0d092 100644 --- a/src/main/java/fr/themode/minestom/recipe/Recipe.java +++ b/src/main/java/net/minestom/server/recipe/Recipe.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.recipe; +package net.minestom.server.recipe; public class Recipe { @@ -28,7 +28,7 @@ public class Recipe { } protected enum RecipeType { - SHAPELESS, SHAPED, SMELTING; + SHAPELESS, SHAPED, SMELTING } } diff --git a/src/main/java/fr/themode/minestom/recipe/RecipeManager.java b/src/main/java/net/minestom/server/recipe/RecipeManager.java similarity index 96% rename from src/main/java/fr/themode/minestom/recipe/RecipeManager.java rename to src/main/java/net/minestom/server/recipe/RecipeManager.java index bd9ecbb5d..bc7344c46 100644 --- a/src/main/java/fr/themode/minestom/recipe/RecipeManager.java +++ b/src/main/java/net/minestom/server/recipe/RecipeManager.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.recipe; +package net.minestom.server.recipe; -import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket; +import net.minestom.server.network.packet.server.play.DeclareRecipesPacket; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/recipe/ShapedRecipe.java b/src/main/java/net/minestom/server/recipe/ShapedRecipe.java similarity index 86% rename from src/main/java/fr/themode/minestom/recipe/ShapedRecipe.java rename to src/main/java/net/minestom/server/recipe/ShapedRecipe.java index 0dea0702e..8f1e00ecd 100644 --- a/src/main/java/fr/themode/minestom/recipe/ShapedRecipe.java +++ b/src/main/java/net/minestom/server/recipe/ShapedRecipe.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.recipe; +package net.minestom.server.recipe; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.server.play.DeclareRecipesPacket; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/recipe/ShapelessRecipe.java b/src/main/java/net/minestom/server/recipe/ShapelessRecipe.java similarity index 82% rename from src/main/java/fr/themode/minestom/recipe/ShapelessRecipe.java rename to src/main/java/net/minestom/server/recipe/ShapelessRecipe.java index f8f9a0ef5..6a9be3827 100644 --- a/src/main/java/fr/themode/minestom/recipe/ShapelessRecipe.java +++ b/src/main/java/net/minestom/server/recipe/ShapelessRecipe.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.recipe; +package net.minestom.server.recipe; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.server.play.DeclareRecipesPacket; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/recipe/SmeltingRecipe.java b/src/main/java/net/minestom/server/recipe/SmeltingRecipe.java similarity index 87% rename from src/main/java/fr/themode/minestom/recipe/SmeltingRecipe.java rename to src/main/java/net/minestom/server/recipe/SmeltingRecipe.java index b8c847057..074940f0e 100644 --- a/src/main/java/fr/themode/minestom/recipe/SmeltingRecipe.java +++ b/src/main/java/net/minestom/server/recipe/SmeltingRecipe.java @@ -1,7 +1,7 @@ -package fr.themode.minestom.recipe; +package net.minestom.server.recipe; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.server.play.DeclareRecipesPacket; public class SmeltingRecipe extends Recipe { diff --git a/src/main/java/fr/themode/minestom/registry/RegistryBlock.java b/src/main/java/net/minestom/server/registry/RegistryBlock.java similarity index 93% rename from src/main/java/fr/themode/minestom/registry/RegistryBlock.java rename to src/main/java/net/minestom/server/registry/RegistryBlock.java index c270c0eae..48c86a74e 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryBlock.java +++ b/src/main/java/net/minestom/server/registry/RegistryBlock.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/themode/minestom/registry/RegistryEntityType.java b/src/main/java/net/minestom/server/registry/RegistryEntityType.java similarity index 71% rename from src/main/java/fr/themode/minestom/registry/RegistryEntityType.java rename to src/main/java/net/minestom/server/registry/RegistryEntityType.java index 1cfe845f6..429fd0782 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryEntityType.java +++ b/src/main/java/net/minestom/server/registry/RegistryEntityType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; public class RegistryEntityType { diff --git a/src/main/java/fr/themode/minestom/registry/RegistryItem.java b/src/main/java/net/minestom/server/registry/RegistryItem.java similarity index 69% rename from src/main/java/fr/themode/minestom/registry/RegistryItem.java rename to src/main/java/net/minestom/server/registry/RegistryItem.java index 331e351bd..d12751a62 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryItem.java +++ b/src/main/java/net/minestom/server/registry/RegistryItem.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; public class RegistryItem { diff --git a/src/main/java/fr/themode/minestom/registry/RegistryMain.java b/src/main/java/net/minestom/server/registry/RegistryMain.java similarity index 98% rename from src/main/java/fr/themode/minestom/registry/RegistryMain.java rename to src/main/java/net/minestom/server/registry/RegistryMain.java index e3ccb589a..92b5a9cea 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryMain.java +++ b/src/main/java/net/minestom/server/registry/RegistryMain.java @@ -1,15 +1,15 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import fr.themode.minestom.entity.EntityType; -import fr.themode.minestom.instance.block.Block; -import fr.themode.minestom.item.Material; -import fr.themode.minestom.particle.Particle; -import fr.themode.minestom.sound.Sound; -import fr.themode.minestom.stat.StatisticType; +import net.minestom.server.entity.EntityType; +import net.minestom.server.instance.block.Block; +import net.minestom.server.item.Material; +import net.minestom.server.particle.Particle; +import net.minestom.server.sound.Sound; +import net.minestom.server.stat.StatisticType; import java.io.BufferedReader; import java.io.FileNotFoundException; diff --git a/src/main/java/fr/themode/minestom/registry/RegistryParticle.java b/src/main/java/net/minestom/server/registry/RegistryParticle.java similarity index 69% rename from src/main/java/fr/themode/minestom/registry/RegistryParticle.java rename to src/main/java/net/minestom/server/registry/RegistryParticle.java index ac66b6664..80210d40c 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryParticle.java +++ b/src/main/java/net/minestom/server/registry/RegistryParticle.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; public class RegistryParticle { diff --git a/src/main/java/fr/themode/minestom/registry/RegistrySound.java b/src/main/java/net/minestom/server/registry/RegistrySound.java similarity index 68% rename from src/main/java/fr/themode/minestom/registry/RegistrySound.java rename to src/main/java/net/minestom/server/registry/RegistrySound.java index b987c1e2e..823b1bb05 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistrySound.java +++ b/src/main/java/net/minestom/server/registry/RegistrySound.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; public class RegistrySound { diff --git a/src/main/java/fr/themode/minestom/registry/RegistryStat.java b/src/main/java/net/minestom/server/registry/RegistryStat.java similarity index 68% rename from src/main/java/fr/themode/minestom/registry/RegistryStat.java rename to src/main/java/net/minestom/server/registry/RegistryStat.java index 225fb45ce..878bdb1ae 100644 --- a/src/main/java/fr/themode/minestom/registry/RegistryStat.java +++ b/src/main/java/net/minestom/server/registry/RegistryStat.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.registry; +package net.minestom.server.registry; public class RegistryStat { diff --git a/src/main/java/fr/themode/minestom/scoreboard/BelowNameScoreboard.java b/src/main/java/net/minestom/server/scoreboard/BelowNameScoreboard.java similarity index 85% rename from src/main/java/fr/themode/minestom/scoreboard/BelowNameScoreboard.java rename to src/main/java/net/minestom/server/scoreboard/BelowNameScoreboard.java index 1570de8d0..8547103fc 100644 --- a/src/main/java/fr/themode/minestom/scoreboard/BelowNameScoreboard.java +++ b/src/main/java/net/minestom/server/scoreboard/BelowNameScoreboard.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.scoreboard; +package net.minestom.server.scoreboard; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.play.DisplayScoreboardPacket; -import fr.themode.minestom.net.packet.server.play.ScoreboardObjectivePacket; -import fr.themode.minestom.net.packet.server.play.UpdateScorePacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.Viewable; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.play.DisplayScoreboardPacket; +import net.minestom.server.network.packet.server.play.ScoreboardObjectivePacket; +import net.minestom.server.network.packet.server.play.UpdateScorePacket; +import net.minestom.server.network.player.PlayerConnection; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/fr/themode/minestom/scoreboard/Sidebar.java b/src/main/java/net/minestom/server/scoreboard/Sidebar.java similarity index 94% rename from src/main/java/fr/themode/minestom/scoreboard/Sidebar.java rename to src/main/java/net/minestom/server/scoreboard/Sidebar.java index fad05f07c..bb12b2a2a 100644 --- a/src/main/java/fr/themode/minestom/scoreboard/Sidebar.java +++ b/src/main/java/net/minestom/server/scoreboard/Sidebar.java @@ -1,12 +1,12 @@ -package fr.themode.minestom.scoreboard; +package net.minestom.server.scoreboard; -import fr.themode.minestom.Viewable; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.play.DisplayScoreboardPacket; -import fr.themode.minestom.net.packet.server.play.ScoreboardObjectivePacket; -import fr.themode.minestom.net.packet.server.play.UpdateScorePacket; -import fr.themode.minestom.net.player.PlayerConnection; +import net.minestom.server.Viewable; +import net.minestom.server.chat.Chat; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.play.DisplayScoreboardPacket; +import net.minestom.server.network.packet.server.play.ScoreboardObjectivePacket; +import net.minestom.server.network.packet.server.play.UpdateScorePacket; +import net.minestom.server.network.player.PlayerConnection; import java.util.Iterator; import java.util.LinkedList; diff --git a/src/main/java/fr/themode/minestom/scoreboard/SidebarTeam.java b/src/main/java/net/minestom/server/scoreboard/SidebarTeam.java similarity index 95% rename from src/main/java/fr/themode/minestom/scoreboard/SidebarTeam.java rename to src/main/java/net/minestom/server/scoreboard/SidebarTeam.java index 6d3771ab1..efeda7b9b 100644 --- a/src/main/java/fr/themode/minestom/scoreboard/SidebarTeam.java +++ b/src/main/java/net/minestom/server/scoreboard/SidebarTeam.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.scoreboard; +package net.minestom.server.scoreboard; -import fr.themode.minestom.net.packet.server.play.TeamsPacket; +import net.minestom.server.network.packet.server.play.TeamsPacket; public class SidebarTeam { diff --git a/src/main/java/fr/themode/minestom/scoreboard/Team.java b/src/main/java/net/minestom/server/scoreboard/Team.java similarity index 96% rename from src/main/java/fr/themode/minestom/scoreboard/Team.java rename to src/main/java/net/minestom/server/scoreboard/Team.java index 61a688bff..5ff0386db 100644 --- a/src/main/java/fr/themode/minestom/scoreboard/Team.java +++ b/src/main/java/net/minestom/server/scoreboard/Team.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.scoreboard; +package net.minestom.server.scoreboard; -import fr.themode.minestom.chat.ChatColor; -import fr.themode.minestom.entity.Player; -import fr.themode.minestom.net.packet.server.play.TeamsPacket; -import fr.themode.minestom.utils.PacketUtils; import io.netty.buffer.ByteBuf; +import net.minestom.server.chat.ChatColor; +import net.minestom.server.entity.Player; +import net.minestom.server.network.packet.server.play.TeamsPacket; +import net.minestom.server.utils.PacketUtils; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/fr/themode/minestom/scoreboard/TeamManager.java b/src/main/java/net/minestom/server/scoreboard/TeamManager.java similarity index 91% rename from src/main/java/fr/themode/minestom/scoreboard/TeamManager.java rename to src/main/java/net/minestom/server/scoreboard/TeamManager.java index fddad7685..42feaaf38 100644 --- a/src/main/java/fr/themode/minestom/scoreboard/TeamManager.java +++ b/src/main/java/net/minestom/server/scoreboard/TeamManager.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.scoreboard; +package net.minestom.server.scoreboard; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/src/main/java/fr/themode/minestom/sound/Sound.java b/src/main/java/net/minestom/server/sound/Sound.java similarity index 99% rename from src/main/java/fr/themode/minestom/sound/Sound.java rename to src/main/java/net/minestom/server/sound/Sound.java index b2fbca0ef..cc88a844d 100644 --- a/src/main/java/fr/themode/minestom/sound/Sound.java +++ b/src/main/java/net/minestom/server/sound/Sound.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.sound; +package net.minestom.server.sound; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/fr/themode/minestom/sound/SoundCategory.java b/src/main/java/net/minestom/server/sound/SoundCategory.java similarity index 81% rename from src/main/java/fr/themode/minestom/sound/SoundCategory.java rename to src/main/java/net/minestom/server/sound/SoundCategory.java index 20e5fe908..cc92bb629 100644 --- a/src/main/java/fr/themode/minestom/sound/SoundCategory.java +++ b/src/main/java/net/minestom/server/sound/SoundCategory.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.sound; +package net.minestom.server.sound; public enum SoundCategory { MASTER, diff --git a/src/main/java/fr/themode/minestom/stat/PlayerStatistic.java b/src/main/java/net/minestom/server/stat/PlayerStatistic.java similarity index 93% rename from src/main/java/fr/themode/minestom/stat/PlayerStatistic.java rename to src/main/java/net/minestom/server/stat/PlayerStatistic.java index 4bece4007..509025f11 100644 --- a/src/main/java/fr/themode/minestom/stat/PlayerStatistic.java +++ b/src/main/java/net/minestom/server/stat/PlayerStatistic.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.stat; +package net.minestom.server.stat; public class PlayerStatistic { diff --git a/src/main/java/fr/themode/minestom/stat/StatisticCategory.java b/src/main/java/net/minestom/server/stat/StatisticCategory.java similarity index 80% rename from src/main/java/fr/themode/minestom/stat/StatisticCategory.java rename to src/main/java/net/minestom/server/stat/StatisticCategory.java index 07da01ca8..8c4385193 100644 --- a/src/main/java/fr/themode/minestom/stat/StatisticCategory.java +++ b/src/main/java/net/minestom/server/stat/StatisticCategory.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.stat; +package net.minestom.server.stat; public enum StatisticCategory { MINED, diff --git a/src/main/java/fr/themode/minestom/stat/StatisticType.java b/src/main/java/net/minestom/server/stat/StatisticType.java similarity index 98% rename from src/main/java/fr/themode/minestom/stat/StatisticType.java rename to src/main/java/net/minestom/server/stat/StatisticType.java index cd91db329..47eed7955 100644 --- a/src/main/java/fr/themode/minestom/stat/StatisticType.java +++ b/src/main/java/net/minestom/server/stat/StatisticType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.stat; +package net.minestom.server.stat; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/fr/themode/minestom/timer/SchedulerManager.java b/src/main/java/net/minestom/server/timer/SchedulerManager.java similarity index 89% rename from src/main/java/fr/themode/minestom/timer/SchedulerManager.java rename to src/main/java/net/minestom/server/timer/SchedulerManager.java index 361194232..f30c44b1c 100644 --- a/src/main/java/fr/themode/minestom/timer/SchedulerManager.java +++ b/src/main/java/net/minestom/server/timer/SchedulerManager.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.timer; +package net.minestom.server.timer; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.utils.thread.MinestomThread; -import fr.themode.minestom.utils.time.CooldownUtils; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.MinecraftServer; +import net.minestom.server.utils.thread.MinestomThread; +import net.minestom.server.utils.time.CooldownUtils; +import net.minestom.server.utils.time.UpdateOption; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/fr/themode/minestom/timer/Task.java b/src/main/java/net/minestom/server/timer/Task.java similarity index 91% rename from src/main/java/fr/themode/minestom/timer/Task.java rename to src/main/java/net/minestom/server/timer/Task.java index f8e3bb135..825d889cf 100644 --- a/src/main/java/fr/themode/minestom/timer/Task.java +++ b/src/main/java/net/minestom/server/timer/Task.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.timer; +package net.minestom.server.timer; -import fr.themode.minestom.utils.time.UpdateOption; +import net.minestom.server.utils.time.UpdateOption; public class Task { diff --git a/src/main/java/fr/themode/minestom/timer/TaskRunnable.java b/src/main/java/net/minestom/server/timer/TaskRunnable.java similarity index 91% rename from src/main/java/fr/themode/minestom/timer/TaskRunnable.java rename to src/main/java/net/minestom/server/timer/TaskRunnable.java index 0b7480cbb..739a47b10 100644 --- a/src/main/java/fr/themode/minestom/timer/TaskRunnable.java +++ b/src/main/java/net/minestom/server/timer/TaskRunnable.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.timer; +package net.minestom.server.timer; public abstract class TaskRunnable { diff --git a/src/main/java/fr/themode/minestom/utils/ArrayUtils.java b/src/main/java/net/minestom/server/utils/ArrayUtils.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/ArrayUtils.java rename to src/main/java/net/minestom/server/utils/ArrayUtils.java index b4897464d..5be324cb1 100644 --- a/src/main/java/fr/themode/minestom/utils/ArrayUtils.java +++ b/src/main/java/net/minestom/server/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; import java.util.ArrayList; diff --git a/src/main/java/fr/themode/minestom/utils/BlockPosition.java b/src/main/java/net/minestom/server/utils/BlockPosition.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/BlockPosition.java rename to src/main/java/net/minestom/server/utils/BlockPosition.java index 7498bd616..021a6a1c2 100644 --- a/src/main/java/fr/themode/minestom/utils/BlockPosition.java +++ b/src/main/java/net/minestom/server/utils/BlockPosition.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class BlockPosition { diff --git a/src/main/java/fr/themode/minestom/utils/ChunkUtils.java b/src/main/java/net/minestom/server/utils/ChunkUtils.java similarity index 94% rename from src/main/java/fr/themode/minestom/utils/ChunkUtils.java rename to src/main/java/net/minestom/server/utils/ChunkUtils.java index fd313b6e7..a15c32ef1 100644 --- a/src/main/java/fr/themode/minestom/utils/ChunkUtils.java +++ b/src/main/java/net/minestom/server/utils/ChunkUtils.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; -import fr.themode.minestom.instance.Instance; +import net.minestom.server.instance.Instance; public class ChunkUtils { diff --git a/src/main/java/fr/themode/minestom/utils/CompressionUtils.java b/src/main/java/net/minestom/server/utils/CompressionUtils.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/CompressionUtils.java rename to src/main/java/net/minestom/server/utils/CompressionUtils.java index 95427aa0c..b51b74a6d 100644 --- a/src/main/java/fr/themode/minestom/utils/CompressionUtils.java +++ b/src/main/java/net/minestom/server/utils/CompressionUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; import com.github.luben.zstd.Zstd; diff --git a/src/main/java/fr/themode/minestom/utils/EntityUtils.java b/src/main/java/net/minestom/server/utils/EntityUtils.java similarity index 85% rename from src/main/java/fr/themode/minestom/utils/EntityUtils.java rename to src/main/java/net/minestom/server/utils/EntityUtils.java index de8330044..8f9fdc140 100644 --- a/src/main/java/fr/themode/minestom/utils/EntityUtils.java +++ b/src/main/java/net/minestom/server/utils/EntityUtils.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; -import fr.themode.minestom.MinecraftServer; -import fr.themode.minestom.entity.Entity; -import fr.themode.minestom.instance.Chunk; -import fr.themode.minestom.instance.Instance; -import fr.themode.minestom.instance.block.Block; +import net.minestom.server.MinecraftServer; +import net.minestom.server.entity.Entity; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; public class EntityUtils { diff --git a/src/main/java/fr/themode/minestom/utils/GroupedCollections.java b/src/main/java/net/minestom/server/utils/GroupedCollections.java similarity index 95% rename from src/main/java/fr/themode/minestom/utils/GroupedCollections.java rename to src/main/java/net/minestom/server/utils/GroupedCollections.java index 9fca7bba6..16661e9ac 100644 --- a/src/main/java/fr/themode/minestom/utils/GroupedCollections.java +++ b/src/main/java/net/minestom/server/utils/GroupedCollections.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/fr/themode/minestom/utils/HexUtils.java b/src/main/java/net/minestom/server/utils/HexUtils.java similarity index 87% rename from src/main/java/fr/themode/minestom/utils/HexUtils.java rename to src/main/java/net/minestom/server/utils/HexUtils.java index 90f524d22..cdbd4a0de 100644 --- a/src/main/java/fr/themode/minestom/utils/HexUtils.java +++ b/src/main/java/net/minestom/server/utils/HexUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class HexUtils { diff --git a/src/main/java/fr/themode/minestom/utils/MathUtils.java b/src/main/java/net/minestom/server/utils/MathUtils.java similarity index 95% rename from src/main/java/fr/themode/minestom/utils/MathUtils.java rename to src/main/java/net/minestom/server/utils/MathUtils.java index 318c1ffee..e118b279b 100644 --- a/src/main/java/fr/themode/minestom/utils/MathUtils.java +++ b/src/main/java/net/minestom/server/utils/MathUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class MathUtils { diff --git a/src/main/java/fr/themode/minestom/utils/NbtReaderUtils.java b/src/main/java/net/minestom/server/utils/NbtReaderUtils.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/NbtReaderUtils.java rename to src/main/java/net/minestom/server/utils/NbtReaderUtils.java index 77ab103e0..a22af3e5d 100644 --- a/src/main/java/fr/themode/minestom/utils/NbtReaderUtils.java +++ b/src/main/java/net/minestom/server/utils/NbtReaderUtils.java @@ -1,10 +1,10 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; import club.thectm.minecraft.text.LegacyText; import club.thectm.minecraft.text.TextObject; import com.google.gson.JsonParser; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketReader; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketReader; import java.util.ArrayList; diff --git a/src/main/java/fr/themode/minestom/utils/PacketUtils.java b/src/main/java/net/minestom/server/utils/PacketUtils.java similarity index 83% rename from src/main/java/fr/themode/minestom/utils/PacketUtils.java rename to src/main/java/net/minestom/server/utils/PacketUtils.java index 973ac290b..0855b7407 100644 --- a/src/main/java/fr/themode/minestom/utils/PacketUtils.java +++ b/src/main/java/net/minestom/server/utils/PacketUtils.java @@ -1,9 +1,9 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.net.packet.server.ServerPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.network.packet.server.ServerPacket; public class PacketUtils { diff --git a/src/main/java/fr/themode/minestom/utils/Position.java b/src/main/java/net/minestom/server/utils/Position.java similarity index 98% rename from src/main/java/fr/themode/minestom/utils/Position.java rename to src/main/java/net/minestom/server/utils/Position.java index b25595819..6b367cdc3 100644 --- a/src/main/java/fr/themode/minestom/utils/Position.java +++ b/src/main/java/net/minestom/server/utils/Position.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class Position { diff --git a/src/main/java/fr/themode/minestom/utils/PrimitiveConversion.java b/src/main/java/net/minestom/server/utils/PrimitiveConversion.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/PrimitiveConversion.java rename to src/main/java/net/minestom/server/utils/PrimitiveConversion.java index dd0fd570a..3d4a8b2ad 100644 --- a/src/main/java/fr/themode/minestom/utils/PrimitiveConversion.java +++ b/src/main/java/net/minestom/server/utils/PrimitiveConversion.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class PrimitiveConversion { diff --git a/src/main/java/fr/themode/minestom/utils/SerializerUtils.java b/src/main/java/net/minestom/server/utils/SerializerUtils.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/SerializerUtils.java rename to src/main/java/net/minestom/server/utils/SerializerUtils.java index 01a050bd9..d86ca78f0 100644 --- a/src/main/java/fr/themode/minestom/utils/SerializerUtils.java +++ b/src/main/java/net/minestom/server/utils/SerializerUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class SerializerUtils { diff --git a/src/main/java/fr/themode/minestom/utils/Utils.java b/src/main/java/net/minestom/server/utils/Utils.java similarity index 95% rename from src/main/java/fr/themode/minestom/utils/Utils.java rename to src/main/java/net/minestom/server/utils/Utils.java index b786aa08b..821dd330e 100644 --- a/src/main/java/fr/themode/minestom/utils/Utils.java +++ b/src/main/java/net/minestom/server/utils/Utils.java @@ -1,11 +1,11 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; -import fr.themode.minestom.chat.Chat; -import fr.themode.minestom.item.ItemStack; -import fr.themode.minestom.net.packet.PacketReader; -import fr.themode.minestom.net.packet.PacketWriter; -import fr.themode.minestom.utils.buffer.BufferWrapper; import io.netty.buffer.ByteBuf; +import net.minestom.server.chat.Chat; +import net.minestom.server.item.ItemStack; +import net.minestom.server.network.packet.PacketReader; +import net.minestom.server.network.packet.PacketWriter; +import net.minestom.server.utils.buffer.BufferWrapper; import java.util.ArrayList; diff --git a/src/main/java/fr/themode/minestom/utils/Vector.java b/src/main/java/net/minestom/server/utils/Vector.java similarity index 99% rename from src/main/java/fr/themode/minestom/utils/Vector.java rename to src/main/java/net/minestom/server/utils/Vector.java index 2bfc239be..e0926a7de 100644 --- a/src/main/java/fr/themode/minestom/utils/Vector.java +++ b/src/main/java/net/minestom/server/utils/Vector.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils; +package net.minestom.server.utils; public class Vector implements Cloneable { diff --git a/src/main/java/fr/themode/minestom/utils/buffer/BufferUtils.java b/src/main/java/net/minestom/server/utils/buffer/BufferUtils.java similarity index 90% rename from src/main/java/fr/themode/minestom/utils/buffer/BufferUtils.java rename to src/main/java/net/minestom/server/utils/buffer/BufferUtils.java index 024b09fc3..be03d5476 100644 --- a/src/main/java/fr/themode/minestom/utils/buffer/BufferUtils.java +++ b/src/main/java/net/minestom/server/utils/buffer/BufferUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.buffer; +package net.minestom.server.utils.buffer; import pbbl.heap.HeapByteBufferPool; diff --git a/src/main/java/fr/themode/minestom/utils/buffer/BufferWrapper.java b/src/main/java/net/minestom/server/utils/buffer/BufferWrapper.java similarity index 93% rename from src/main/java/fr/themode/minestom/utils/buffer/BufferWrapper.java rename to src/main/java/net/minestom/server/utils/buffer/BufferWrapper.java index 3a2d48fcb..0c0c992f5 100644 --- a/src/main/java/fr/themode/minestom/utils/buffer/BufferWrapper.java +++ b/src/main/java/net/minestom/server/utils/buffer/BufferWrapper.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.utils.buffer; +package net.minestom.server.utils.buffer; -import fr.themode.minestom.utils.Utils; +import net.minestom.server.utils.Utils; import java.nio.ByteBuffer; diff --git a/src/main/java/fr/themode/minestom/utils/consumer/StringConsumer.java b/src/main/java/net/minestom/server/utils/consumer/StringConsumer.java similarity index 65% rename from src/main/java/fr/themode/minestom/utils/consumer/StringConsumer.java rename to src/main/java/net/minestom/server/utils/consumer/StringConsumer.java index f6707cadc..14890781b 100644 --- a/src/main/java/fr/themode/minestom/utils/consumer/StringConsumer.java +++ b/src/main/java/net/minestom/server/utils/consumer/StringConsumer.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.consumer; +package net.minestom.server.utils.consumer; public interface StringConsumer { diff --git a/src/main/java/fr/themode/minestom/utils/inventory/PlayerInventoryUtils.java b/src/main/java/net/minestom/server/utils/inventory/PlayerInventoryUtils.java similarity index 97% rename from src/main/java/fr/themode/minestom/utils/inventory/PlayerInventoryUtils.java rename to src/main/java/net/minestom/server/utils/inventory/PlayerInventoryUtils.java index de4950428..ebc8b1249 100644 --- a/src/main/java/fr/themode/minestom/utils/inventory/PlayerInventoryUtils.java +++ b/src/main/java/net/minestom/server/utils/inventory/PlayerInventoryUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.inventory; +package net.minestom.server.utils.inventory; public class PlayerInventoryUtils { diff --git a/src/main/java/fr/themode/minestom/utils/noise/FastNoise.java b/src/main/java/net/minestom/server/utils/noise/FastNoise.java similarity index 99% rename from src/main/java/fr/themode/minestom/utils/noise/FastNoise.java rename to src/main/java/net/minestom/server/utils/noise/FastNoise.java index 6b2eac34a..fd3cd01d0 100644 --- a/src/main/java/fr/themode/minestom/utils/noise/FastNoise.java +++ b/src/main/java/net/minestom/server/utils/noise/FastNoise.java @@ -26,7 +26,7 @@ // off every 'zix'.) // -package fr.themode.minestom.utils.noise; +package net.minestom.server.utils.noise; import javax.vecmath.Vector2f; import javax.vecmath.Vector3f; diff --git a/src/main/java/fr/themode/minestom/utils/thread/MinestomThread.java b/src/main/java/net/minestom/server/utils/thread/MinestomThread.java similarity index 92% rename from src/main/java/fr/themode/minestom/utils/thread/MinestomThread.java rename to src/main/java/net/minestom/server/utils/thread/MinestomThread.java index ef2159e5e..c2f7b1976 100644 --- a/src/main/java/fr/themode/minestom/utils/thread/MinestomThread.java +++ b/src/main/java/net/minestom/server/utils/thread/MinestomThread.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.thread; +package net.minestom.server.utils.thread; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/src/main/java/fr/themode/minestom/utils/time/CooldownUtils.java b/src/main/java/net/minestom/server/utils/time/CooldownUtils.java similarity index 91% rename from src/main/java/fr/themode/minestom/utils/time/CooldownUtils.java rename to src/main/java/net/minestom/server/utils/time/CooldownUtils.java index a74629db6..b4b7fe825 100644 --- a/src/main/java/fr/themode/minestom/utils/time/CooldownUtils.java +++ b/src/main/java/net/minestom/server/utils/time/CooldownUtils.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.time; +package net.minestom.server.utils.time; public class CooldownUtils { diff --git a/src/main/java/fr/themode/minestom/utils/time/TimeUnit.java b/src/main/java/net/minestom/server/utils/time/TimeUnit.java similarity index 78% rename from src/main/java/fr/themode/minestom/utils/time/TimeUnit.java rename to src/main/java/net/minestom/server/utils/time/TimeUnit.java index f5cf7e921..9bee51720 100644 --- a/src/main/java/fr/themode/minestom/utils/time/TimeUnit.java +++ b/src/main/java/net/minestom/server/utils/time/TimeUnit.java @@ -1,6 +1,6 @@ -package fr.themode.minestom.utils.time; +package net.minestom.server.utils.time; -import fr.themode.minestom.MinecraftServer; +import net.minestom.server.MinecraftServer; public enum TimeUnit { diff --git a/src/main/java/fr/themode/minestom/utils/time/UpdateOption.java b/src/main/java/net/minestom/server/utils/time/UpdateOption.java similarity index 90% rename from src/main/java/fr/themode/minestom/utils/time/UpdateOption.java rename to src/main/java/net/minestom/server/utils/time/UpdateOption.java index d36310fa2..a8d948498 100644 --- a/src/main/java/fr/themode/minestom/utils/time/UpdateOption.java +++ b/src/main/java/net/minestom/server/utils/time/UpdateOption.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.utils.time; +package net.minestom.server.utils.time; public class UpdateOption { diff --git a/src/main/java/fr/themode/minestom/world/Difficulty.java b/src/main/java/net/minestom/server/world/Difficulty.java similarity index 86% rename from src/main/java/fr/themode/minestom/world/Difficulty.java rename to src/main/java/net/minestom/server/world/Difficulty.java index 13aefba81..f33748083 100644 --- a/src/main/java/fr/themode/minestom/world/Difficulty.java +++ b/src/main/java/net/minestom/server/world/Difficulty.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.world; +package net.minestom.server.world; public enum Difficulty { diff --git a/src/main/java/fr/themode/minestom/world/Dimension.java b/src/main/java/net/minestom/server/world/Dimension.java similarity index 84% rename from src/main/java/fr/themode/minestom/world/Dimension.java rename to src/main/java/net/minestom/server/world/Dimension.java index 80dc05a0d..74bb07fba 100644 --- a/src/main/java/fr/themode/minestom/world/Dimension.java +++ b/src/main/java/net/minestom/server/world/Dimension.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.world; +package net.minestom.server.world; public enum Dimension { diff --git a/src/main/java/fr/themode/minestom/world/LevelType.java b/src/main/java/net/minestom/server/world/LevelType.java similarity index 89% rename from src/main/java/fr/themode/minestom/world/LevelType.java rename to src/main/java/net/minestom/server/world/LevelType.java index cf0a18f01..45540a5b0 100644 --- a/src/main/java/fr/themode/minestom/world/LevelType.java +++ b/src/main/java/net/minestom/server/world/LevelType.java @@ -1,4 +1,4 @@ -package fr.themode.minestom.world; +package net.minestom.server.world; public enum LevelType {