From fff78cdf94a150620df61baaf9b2cf88aec9389a Mon Sep 17 00:00:00 2001 From: TheMode Date: Thu, 8 Jul 2021 13:48:28 +0200 Subject: [PATCH] Move coordinate package --- .../java/net/minestom/server/collision/BoundingBox.java | 4 ++-- .../java/net/minestom/server/collision/CollisionUtils.java | 6 +++--- .../net/minestom/server/{utils => }/coordinate/Point.java | 2 +- .../net/minestom/server/{utils => }/coordinate/Pos.java | 2 +- .../net/minestom/server/{utils => }/coordinate/Vec.java | 2 +- src/main/java/net/minestom/server/entity/Entity.java | 6 +++--- .../java/net/minestom/server/entity/EntityProjectile.java | 6 +++--- src/main/java/net/minestom/server/entity/ExperienceOrb.java | 2 +- src/main/java/net/minestom/server/entity/LivingEntity.java | 4 ++-- src/main/java/net/minestom/server/entity/Metadata.java | 2 +- src/main/java/net/minestom/server/entity/Player.java | 4 ++-- .../minestom/server/entity/ai/goal/FollowTargetGoal.java | 2 +- .../net/minestom/server/entity/ai/goal/MeleeAttackGoal.java | 2 +- .../server/entity/ai/goal/RandomLookAroundGoal.java | 2 +- .../minestom/server/entity/ai/goal/RandomStrollGoal.java | 2 +- .../java/net/minestom/server/entity/hologram/Hologram.java | 3 +-- .../net/minestom/server/entity/pathfinding/Navigator.java | 6 +++--- .../minestom/server/entity/pathfinding/PFPathingEntity.java | 2 +- .../net/minestom/server/event/entity/EntityShootEvent.java | 2 +- .../minestom/server/event/entity/EntityVelocityEvent.java | 2 +- .../minestom/server/event/player/PlayerBlockBreakEvent.java | 2 +- .../server/event/player/PlayerBlockInteractEvent.java | 3 +-- .../minestom/server/event/player/PlayerBlockPlaceEvent.java | 3 +-- .../net/minestom/server/event/player/PlayerMoveEvent.java | 2 +- .../minestom/server/event/player/PlayerRespawnEvent.java | 2 +- .../server/event/player/PlayerStartDiggingEvent.java | 2 +- .../server/event/player/PlayerUseItemOnBlockEvent.java | 2 +- src/main/java/net/minestom/server/instance/Instance.java | 4 ++-- .../net/minestom/server/instance/InstanceContainer.java | 2 +- .../java/net/minestom/server/instance/SharedInstance.java | 2 +- src/main/java/net/minestom/server/instance/WorldBorder.java | 2 +- .../net/minestom/server/instance/block/BlockGetter.java | 2 +- .../net/minestom/server/instance/block/BlockHandler.java | 2 +- .../server/instance/block/rule/BlockPlacementRule.java | 2 +- .../instance/block/rule/vanilla/AxisPlacementRule.java | 2 +- .../instance/block/rule/vanilla/RedstonePlacementRule.java | 2 +- .../instance/block/rule/vanilla/StairsPlacementRule.java | 2 +- .../instance/block/rule/vanilla/WallPlacementRule.java | 2 +- .../minestom/server/listener/BlockPlacementListener.java | 4 ++-- .../net/minestom/server/listener/PlayerDiggingListener.java | 2 +- .../minestom/server/listener/PlayerPositionListener.java | 2 +- .../net/minestom/server/listener/PlayerVehicleListener.java | 2 +- .../packet/client/play/ClientGenerateStructurePacket.java | 4 ++-- .../client/play/ClientPlayerBlockPlacementPacket.java | 5 ++--- .../packet/client/play/ClientPlayerDiggingPacket.java | 4 ++-- .../packet/client/play/ClientQueryBlockNbtPacket.java | 4 ++-- .../packet/client/play/ClientUpdateCommandBlockPacket.java | 4 ++-- .../network/packet/client/play/ClientUpdateSignPacket.java | 4 ++-- .../client/play/ClientUpdateStructureBlockPacket.java | 4 ++-- .../packet/server/play/AcknowledgePlayerDiggingPacket.java | 4 ++-- .../network/packet/server/play/BlockActionPacket.java | 4 ++-- .../packet/server/play/BlockBreakAnimationPacket.java | 4 ++-- .../network/packet/server/play/BlockChangePacket.java | 4 ++-- .../network/packet/server/play/BlockEntityDataPacket.java | 4 ++-- .../server/network/packet/server/play/EffectPacket.java | 4 ++-- .../packet/server/play/EntityPositionAndRotationPacket.java | 2 +- .../network/packet/server/play/EntityPositionPacket.java | 2 +- .../network/packet/server/play/EntityTeleportPacket.java | 2 +- .../network/packet/server/play/OpenSignEditorPacket.java | 4 ++-- .../packet/server/play/PlayerPositionAndLookPacket.java | 2 +- .../network/packet/server/play/SoundEffectPacket.java | 2 +- .../network/packet/server/play/SpawnEntityPacket.java | 2 +- .../packet/server/play/SpawnExperienceOrbPacket.java | 2 +- .../network/packet/server/play/SpawnLivingEntityPacket.java | 2 +- .../network/packet/server/play/SpawnPaintingPacket.java | 4 ++-- .../network/packet/server/play/SpawnPlayerPacket.java | 2 +- .../network/packet/server/play/SpawnPositionPacket.java | 4 ++-- src/main/java/net/minestom/server/utils/BlockPosition.java | 5 ++--- src/main/java/net/minestom/server/utils/Position.java | 4 ++-- .../java/net/minestom/server/utils/SerializerUtils.java | 4 ++-- src/main/java/net/minestom/server/utils/Vector.java | 6 ++---- .../java/net/minestom/server/utils/binary/BinaryReader.java | 3 +-- .../java/net/minestom/server/utils/binary/BinaryWriter.java | 2 +- .../java/net/minestom/server/utils/block/BlockIterator.java | 6 +++--- .../java/net/minestom/server/utils/block/BlockUtils.java | 2 +- .../java/net/minestom/server/utils/chunk/ChunkUtils.java | 2 +- .../java/net/minestom/server/utils/entity/EntityUtils.java | 4 ++-- .../minestom/server/utils/location/RelativeLocation.java | 4 ++-- .../net/minestom/server/utils/position/PositionUtils.java | 2 +- src/test/java/demo/MainDemo.java | 2 +- src/test/java/demo/PlayerInit.java | 4 ++-- src/test/java/demo/commands/TeleportCommand.java | 2 +- src/test/java/demo/entity/ChickenCreature.java | 2 +- 83 files changed, 121 insertions(+), 129 deletions(-) rename src/main/java/net/minestom/server/{utils => }/coordinate/Point.java (99%) rename src/main/java/net/minestom/server/{utils => }/coordinate/Pos.java (99%) rename src/main/java/net/minestom/server/{utils => }/coordinate/Vec.java (99%) diff --git a/src/main/java/net/minestom/server/collision/BoundingBox.java b/src/main/java/net/minestom/server/collision/BoundingBox.java index 8ef3ddcb9..d6ea5ee76 100644 --- a/src/main/java/net/minestom/server/collision/BoundingBox.java +++ b/src/main/java/net/minestom/server/collision/BoundingBox.java @@ -2,8 +2,8 @@ package net.minestom.server.collision; import net.minestom.server.entity.Entity; import net.minestom.server.utils.BlockPosition; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/collision/CollisionUtils.java b/src/main/java/net/minestom/server/collision/CollisionUtils.java index ff48388e8..e2e1b1dc6 100644 --- a/src/main/java/net/minestom/server/collision/CollisionUtils.java +++ b/src/main/java/net/minestom/server/collision/CollisionUtils.java @@ -6,9 +6,9 @@ import net.minestom.server.instance.Instance; import net.minestom.server.instance.WorldBorder; import net.minestom.server.instance.block.Block; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class CollisionUtils { diff --git a/src/main/java/net/minestom/server/utils/coordinate/Point.java b/src/main/java/net/minestom/server/coordinate/Point.java similarity index 99% rename from src/main/java/net/minestom/server/utils/coordinate/Point.java rename to src/main/java/net/minestom/server/coordinate/Point.java index f02b6d8a8..bf116427b 100644 --- a/src/main/java/net/minestom/server/utils/coordinate/Point.java +++ b/src/main/java/net/minestom/server/coordinate/Point.java @@ -1,4 +1,4 @@ -package net.minestom.server.utils.coordinate; +package net.minestom.server.coordinate; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.utils.MathUtils; diff --git a/src/main/java/net/minestom/server/utils/coordinate/Pos.java b/src/main/java/net/minestom/server/coordinate/Pos.java similarity index 99% rename from src/main/java/net/minestom/server/utils/coordinate/Pos.java rename to src/main/java/net/minestom/server/coordinate/Pos.java index 81ba2ccc6..11ef3cf7f 100644 --- a/src/main/java/net/minestom/server/utils/coordinate/Pos.java +++ b/src/main/java/net/minestom/server/coordinate/Pos.java @@ -1,4 +1,4 @@ -package net.minestom.server.utils.coordinate; +package net.minestom.server.coordinate; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.utils.MathUtils; diff --git a/src/main/java/net/minestom/server/utils/coordinate/Vec.java b/src/main/java/net/minestom/server/coordinate/Vec.java similarity index 99% rename from src/main/java/net/minestom/server/utils/coordinate/Vec.java rename to src/main/java/net/minestom/server/coordinate/Vec.java index 2ec027f5b..7f9ca695f 100644 --- a/src/main/java/net/minestom/server/utils/coordinate/Vec.java +++ b/src/main/java/net/minestom/server/coordinate/Vec.java @@ -1,4 +1,4 @@ -package net.minestom.server.utils.coordinate; +package net.minestom.server.coordinate; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.utils.MathUtils; diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index d57658582..e9e5f71b2 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -41,9 +41,9 @@ import net.minestom.server.utils.Position; import net.minestom.server.utils.callback.OptionalCallback; import net.minestom.server.utils.chunk.ChunkCallback; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import net.minestom.server.utils.entity.EntityUtils; import net.minestom.server.utils.player.PlayerUtils; import net.minestom.server.utils.time.Cooldown; diff --git a/src/main/java/net/minestom/server/entity/EntityProjectile.java b/src/main/java/net/minestom/server/entity/EntityProjectile.java index a39d50598..ce3890aeb 100644 --- a/src/main/java/net/minestom/server/entity/EntityProjectile.java +++ b/src/main/java/net/minestom/server/entity/EntityProjectile.java @@ -7,9 +7,9 @@ import net.minestom.server.event.entity.EntityShootEvent; import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/entity/ExperienceOrb.java b/src/main/java/net/minestom/server/entity/ExperienceOrb.java index acf99ab98..76eb77612 100644 --- a/src/main/java/net/minestom/server/entity/ExperienceOrb.java +++ b/src/main/java/net/minestom/server/entity/ExperienceOrb.java @@ -1,6 +1,6 @@ package net.minestom.server.entity; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Vec; import java.util.Comparator; diff --git a/src/main/java/net/minestom/server/entity/LivingEntity.java b/src/main/java/net/minestom/server/entity/LivingEntity.java index eab6644c0..2ec1f2977 100644 --- a/src/main/java/net/minestom/server/entity/LivingEntity.java +++ b/src/main/java/net/minestom/server/entity/LivingEntity.java @@ -27,8 +27,8 @@ import net.minestom.server.scoreboard.Team; import net.minestom.server.sound.SoundEvent; import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.block.BlockIterator; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/entity/Metadata.java b/src/main/java/net/minestom/server/entity/Metadata.java index 31963ed19..58ed7b3d6 100644 --- a/src/main/java/net/minestom/server/entity/Metadata.java +++ b/src/main/java/net/minestom/server/entity/Metadata.java @@ -13,7 +13,7 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.Readable; import net.minestom.server.utils.binary.Writeable; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jglrxavpok.hephaistos.nbt.NBT; diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 941cd4dcd..5509c3b6a 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -68,8 +68,8 @@ import net.minestom.server.stat.PlayerStatistic; import net.minestom.server.utils.*; import net.minestom.server.utils.chunk.ChunkCallback; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; import net.minestom.server.utils.entity.EntityUtils; import net.minestom.server.utils.identity.NamedAndIdentified; import net.minestom.server.utils.instance.InstanceUtils; diff --git a/src/main/java/net/minestom/server/entity/ai/goal/FollowTargetGoal.java b/src/main/java/net/minestom/server/entity/ai/goal/FollowTargetGoal.java index 589a71074..37f89d8ba 100644 --- a/src/main/java/net/minestom/server/entity/ai/goal/FollowTargetGoal.java +++ b/src/main/java/net/minestom/server/entity/ai/goal/FollowTargetGoal.java @@ -4,7 +4,7 @@ import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.ai.GoalSelector; import net.minestom.server.entity.pathfinding.Navigator; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.time.Duration; diff --git a/src/main/java/net/minestom/server/entity/ai/goal/MeleeAttackGoal.java b/src/main/java/net/minestom/server/entity/ai/goal/MeleeAttackGoal.java index 12f357b20..0527d4c6e 100644 --- a/src/main/java/net/minestom/server/entity/ai/goal/MeleeAttackGoal.java +++ b/src/main/java/net/minestom/server/entity/ai/goal/MeleeAttackGoal.java @@ -5,7 +5,7 @@ import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.ai.GoalSelector; import net.minestom.server.entity.ai.TargetSelector; import net.minestom.server.entity.pathfinding.Navigator; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/entity/ai/goal/RandomLookAroundGoal.java b/src/main/java/net/minestom/server/entity/ai/goal/RandomLookAroundGoal.java index a16e5299e..4a630137b 100644 --- a/src/main/java/net/minestom/server/entity/ai/goal/RandomLookAroundGoal.java +++ b/src/main/java/net/minestom/server/entity/ai/goal/RandomLookAroundGoal.java @@ -2,7 +2,7 @@ package net.minestom.server.entity.ai.goal; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.ai.GoalSelector; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import java.util.Random; diff --git a/src/main/java/net/minestom/server/entity/ai/goal/RandomStrollGoal.java b/src/main/java/net/minestom/server/entity/ai/goal/RandomStrollGoal.java index 5e5c068d2..7c198fda9 100644 --- a/src/main/java/net/minestom/server/entity/ai/goal/RandomStrollGoal.java +++ b/src/main/java/net/minestom/server/entity/ai/goal/RandomStrollGoal.java @@ -2,7 +2,7 @@ package net.minestom.server.entity.ai.goal; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.ai.GoalSelector; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/src/main/java/net/minestom/server/entity/hologram/Hologram.java b/src/main/java/net/minestom/server/entity/hologram/Hologram.java index 476fdc108..24a776062 100644 --- a/src/main/java/net/minestom/server/entity/hologram/Hologram.java +++ b/src/main/java/net/minestom/server/entity/hologram/Hologram.java @@ -8,8 +8,7 @@ import net.minestom.server.entity.EntityType; import net.minestom.server.entity.Player; import net.minestom.server.entity.metadata.other.ArmorStandMeta; import net.minestom.server.instance.Instance; -import net.minestom.server.utils.Position; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/entity/pathfinding/Navigator.java b/src/main/java/net/minestom/server/entity/pathfinding/Navigator.java index 77a0fb2d0..c6adfff62 100644 --- a/src/main/java/net/minestom/server/entity/pathfinding/Navigator.java +++ b/src/main/java/net/minestom/server/entity/pathfinding/Navigator.java @@ -10,9 +10,9 @@ import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Instance; import net.minestom.server.instance.WorldBorder; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import net.minestom.server.utils.position.PositionUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/entity/pathfinding/PFPathingEntity.java b/src/main/java/net/minestom/server/entity/pathfinding/PFPathingEntity.java index 5227797d3..75a6df53d 100644 --- a/src/main/java/net/minestom/server/entity/pathfinding/PFPathingEntity.java +++ b/src/main/java/net/minestom/server/entity/pathfinding/PFPathingEntity.java @@ -8,7 +8,7 @@ import net.minestom.server.attribute.Attribute; import net.minestom.server.entity.Entity; import net.minestom.server.entity.LivingEntity; import net.minestom.server.utils.Position; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; public class PFPathingEntity implements IPathingEntity { diff --git a/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java b/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java index bffae8387..7f1b5d1be 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.entity.EntityProjectile; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.utils.Position; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java b/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java index 91a181b04..a52429b5d 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.EntityEvent; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java index 33617d398..050099c71 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.trait.BlockEvent; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.instance.block.Block; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; public class PlayerBlockBreakEvent implements PlayerEvent, BlockEvent, CancellableEvent { diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java index ebf8e3363..2de072bd9 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java @@ -6,8 +6,7 @@ import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; -import net.minestom.server.utils.BlockPosition; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java index b16d01482..fb1582e5f 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java @@ -5,8 +5,7 @@ import net.minestom.server.event.trait.BlockEvent; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.instance.block.Block; -import net.minestom.server.utils.BlockPosition; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java index bf20d28b0..1951ee0a0 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event.player; import net.minestom.server.entity.Player; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.PlayerEvent; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java index 8bcd19d4c..750079755 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java @@ -2,7 +2,7 @@ package net.minestom.server.event.player; import net.minestom.server.entity.Player; import net.minestom.server.event.trait.PlayerEvent; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java index c6667c6a0..dcba7aecc 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.trait.BlockEvent; import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.instance.block.Block; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java index 505767944..e7416088b 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.trait.ItemEvent; import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.item.ItemStack; import net.minestom.server.utils.Direction; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/instance/Instance.java b/src/main/java/net/minestom/server/instance/Instance.java index 55a6f1c5b..df05555fd 100644 --- a/src/main/java/net/minestom/server/instance/Instance.java +++ b/src/main/java/net/minestom/server/instance/Instance.java @@ -34,8 +34,8 @@ import net.minestom.server.utils.PacketUtils; import net.minestom.server.utils.Position; import net.minestom.server.utils.chunk.ChunkCallback; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; import net.minestom.server.utils.entity.EntityUtils; import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.TimeUnit; diff --git a/src/main/java/net/minestom/server/instance/InstanceContainer.java b/src/main/java/net/minestom/server/instance/InstanceContainer.java index 1bb1395aa..a9b6dec6c 100644 --- a/src/main/java/net/minestom/server/instance/InstanceContainer.java +++ b/src/main/java/net/minestom/server/instance/InstanceContainer.java @@ -23,7 +23,7 @@ import net.minestom.server.utils.callback.OptionalCallback; import net.minestom.server.utils.chunk.ChunkCallback; import net.minestom.server.utils.chunk.ChunkSupplier; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import net.minestom.server.utils.validate.Check; import net.minestom.server.world.DimensionType; import net.minestom.server.world.biomes.Biome; diff --git a/src/main/java/net/minestom/server/instance/SharedInstance.java b/src/main/java/net/minestom/server/instance/SharedInstance.java index cd210ec89..0dab7b474 100644 --- a/src/main/java/net/minestom/server/instance/SharedInstance.java +++ b/src/main/java/net/minestom/server/instance/SharedInstance.java @@ -5,7 +5,7 @@ import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.storage.StorageLocation; import net.minestom.server.utils.chunk.ChunkCallback; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/instance/WorldBorder.java b/src/main/java/net/minestom/server/instance/WorldBorder.java index f8167fe2b..d26c1d198 100644 --- a/src/main/java/net/minestom/server/instance/WorldBorder.java +++ b/src/main/java/net/minestom/server/instance/WorldBorder.java @@ -5,7 +5,7 @@ import net.minestom.server.entity.Player; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.play.*; import net.minestom.server.utils.PacketUtils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/net/minestom/server/instance/block/BlockGetter.java b/src/main/java/net/minestom/server/instance/block/BlockGetter.java index f57353628..003cc11f0 100644 --- a/src/main/java/net/minestom/server/instance/block/BlockGetter.java +++ b/src/main/java/net/minestom/server/instance/block/BlockGetter.java @@ -1,6 +1,6 @@ package net.minestom.server.instance.block; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; public interface BlockGetter { diff --git a/src/main/java/net/minestom/server/instance/block/BlockHandler.java b/src/main/java/net/minestom/server/instance/block/BlockHandler.java index c9d8ff0b3..1ceb860f1 100644 --- a/src/main/java/net/minestom/server/instance/block/BlockHandler.java +++ b/src/main/java/net/minestom/server/instance/block/BlockHandler.java @@ -5,7 +5,7 @@ import net.minestom.server.entity.Player; import net.minestom.server.instance.Instance; import net.minestom.server.tag.Tag; import net.minestom.server.utils.NamespaceID; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java index 918b469ca..cb354931a 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java @@ -4,7 +4,7 @@ import net.minestom.server.entity.Player; import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/instance/block/rule/vanilla/AxisPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/AxisPlacementRule.java index 90e9e2931..01bc0eaa6 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/vanilla/AxisPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/AxisPlacementRule.java @@ -5,7 +5,7 @@ import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.instance.block.rule.BlockPlacementRule; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; public class AxisPlacementRule extends BlockPlacementRule { diff --git a/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java index 9a9359424..c0a8a6837 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/RedstonePlacementRule.java @@ -6,7 +6,7 @@ import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.instance.block.rule.BlockPlacementRule; import net.minestom.server.utils.block.BlockUtils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java index 5f010cc86..216cc1e86 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java @@ -7,7 +7,7 @@ import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.instance.block.rule.BlockPlacementRule; import net.minestom.server.utils.BlockPosition; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/instance/block/rule/vanilla/WallPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/WallPlacementRule.java index b9dda959b..b3a942682 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/vanilla/WallPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/WallPlacementRule.java @@ -5,7 +5,7 @@ import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.instance.block.rule.BlockPlacementRule; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java index 5b8907d9e..19829cc71 100644 --- a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java +++ b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java @@ -24,8 +24,8 @@ import net.minestom.server.network.packet.client.play.ClientPlayerBlockPlacement import net.minestom.server.network.packet.server.play.BlockChangePacket; import net.minestom.server.utils.Direction; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import net.minestom.server.utils.validate.Check; import java.util.Set; diff --git a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java index dbefb981c..1164db0aa 100644 --- a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java @@ -13,7 +13,7 @@ import net.minestom.server.item.ItemStack; import net.minestom.server.item.StackingRule; import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket; import net.minestom.server.network.packet.server.play.AcknowledgePlayerDiggingPacket; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; public class PlayerDiggingListener { diff --git a/src/main/java/net/minestom/server/listener/PlayerPositionListener.java b/src/main/java/net/minestom/server/listener/PlayerPositionListener.java index d7c31e29a..6ea006767 100644 --- a/src/main/java/net/minestom/server/listener/PlayerPositionListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerPositionListener.java @@ -6,7 +6,7 @@ import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.instance.Instance; import net.minestom.server.network.packet.client.play.*; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class PlayerPositionListener { diff --git a/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java b/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java index a816be7c0..45ee104de 100644 --- a/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerVehicleListener.java @@ -6,7 +6,7 @@ import net.minestom.server.entity.metadata.other.BoatMeta; import net.minestom.server.network.packet.client.play.ClientSteerBoatPacket; import net.minestom.server.network.packet.client.play.ClientSteerVehiclePacket; import net.minestom.server.network.packet.client.play.ClientVehicleMovePacket; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; public class PlayerVehicleListener { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientGenerateStructurePacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientGenerateStructurePacket.java index c41e854f2..67add65de 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientGenerateStructurePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientGenerateStructurePacket.java @@ -3,8 +3,8 @@ package net.minestom.server.network.packet.client.play; import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientGenerateStructurePacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java index 6d9606474..91581be44 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerBlockPlacementPacket.java @@ -3,11 +3,10 @@ package net.minestom.server.network.packet.client.play; import net.minestom.server.entity.Player; import net.minestom.server.instance.block.BlockFace; import net.minestom.server.network.packet.client.ClientPlayPacket; -import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientPlayerBlockPlacementPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java index 9dd31d300..88edf7bfc 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientPlayerDiggingPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.instance.block.BlockFace; import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientPlayerDiggingPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientQueryBlockNbtPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientQueryBlockNbtPacket.java index 1131f2a2b..f0a7bf897 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientQueryBlockNbtPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientQueryBlockNbtPacket.java @@ -3,8 +3,8 @@ package net.minestom.server.network.packet.client.play; import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientQueryBlockNbtPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java index 79a9dcd8e..7f581516b 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateCommandBlockPacket.java @@ -3,8 +3,8 @@ package net.minestom.server.network.packet.client.play; import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientUpdateCommandBlockPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java index d1fe1d964..20f62a968 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateSignPacket.java @@ -3,8 +3,8 @@ package net.minestom.server.network.packet.client.play; import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientUpdateSignPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateStructureBlockPacket.java b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateStructureBlockPacket.java index a8871f0fa..c7553cc06 100644 --- a/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateStructureBlockPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/play/ClientUpdateStructureBlockPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.client.ClientPlayPacket; import net.minestom.server.utils.Rotation; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class ClientUpdateStructureBlockPacket extends ClientPlayPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java index e4f478cc4..52e9e3f7a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgePlayerDiggingPacket.java @@ -5,8 +5,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class AcknowledgePlayerDiggingPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java index 8aa4ce34d..58728b100 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class BlockActionPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java index d5915713e..efb060e38 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class BlockBreakAnimationPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java index 3806a1ca3..494c42728 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class BlockChangePacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java index a1deb6b6a..03a67decb 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java @@ -5,8 +5,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBTCompound; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java index 2871c1e38..8120de0c5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class EffectPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java index 1bab53308..5f2389d18 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class EntityPositionAndRotationPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java index 8df4a2c04..a15e63b6d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class EntityPositionPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java index 040bd2e30..2be5eceee 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class EntityTeleportPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java index 1c8fc26bd..06a22eb5e 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class OpenSignEditorPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java index 6e86d68fb..f888a9d49 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class PlayerPositionAndLookPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java index e3c0f433b..6f6a23951 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java @@ -7,7 +7,7 @@ import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.sound.SoundEvent; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class SoundEffectPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java index d345fae9d..f220801a1 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java index b4ffa30ac..b0db786b2 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public class SpawnExperienceOrbPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java index 3031564b9..c407ab502 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnLivingEntityPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java index 8a650ad73..4a9308b6a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPaintingPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java index 2d3c98cee..4667889b8 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java @@ -4,7 +4,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java index c8b5ce1d8..286eb6c72 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java @@ -4,8 +4,8 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; public class SpawnPositionPacket implements ServerPacket { diff --git a/src/main/java/net/minestom/server/utils/BlockPosition.java b/src/main/java/net/minestom/server/utils/BlockPosition.java index a20427f93..42f7d8dcd 100644 --- a/src/main/java/net/minestom/server/utils/BlockPosition.java +++ b/src/main/java/net/minestom/server/utils/BlockPosition.java @@ -1,8 +1,7 @@ package net.minestom.server.utils; import net.minestom.server.instance.block.BlockFace; -import net.minestom.server.utils.clone.PublicCloneable; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.util.Objects; @@ -13,7 +12,7 @@ import java.util.function.DoubleUnaryOperator; /** * Represents the position of a block, so with integers instead of floating numbers. * - * @deprecated use {@link net.minestom.server.utils.coordinate.Vec} instead + * @deprecated use {@link net.minestom.server.coordinate.Vec} instead */ @Deprecated public class BlockPosition implements Point { diff --git a/src/main/java/net/minestom/server/utils/Position.java b/src/main/java/net/minestom/server/utils/Position.java index b98797ebd..3768b28c1 100644 --- a/src/main/java/net/minestom/server/utils/Position.java +++ b/src/main/java/net/minestom/server/utils/Position.java @@ -1,7 +1,7 @@ package net.minestom.server.utils; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.util.Objects; @@ -11,7 +11,7 @@ import java.util.function.DoubleUnaryOperator; * Represents a position. * The instance is not contained. * - * @deprecated use {@link net.minestom.server.utils.coordinate.Pos} instead + * @deprecated use {@link net.minestom.server.coordinate.Pos} instead */ @Deprecated public class Position implements Point { diff --git a/src/main/java/net/minestom/server/utils/SerializerUtils.java b/src/main/java/net/minestom/server/utils/SerializerUtils.java index 49938841b..1b923ea64 100644 --- a/src/main/java/net/minestom/server/utils/SerializerUtils.java +++ b/src/main/java/net/minestom/server/utils/SerializerUtils.java @@ -1,7 +1,7 @@ package net.minestom.server.utils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Vec; public final class SerializerUtils { diff --git a/src/main/java/net/minestom/server/utils/Vector.java b/src/main/java/net/minestom/server/utils/Vector.java index 65a8ee0cd..b9eb95b61 100644 --- a/src/main/java/net/minestom/server/utils/Vector.java +++ b/src/main/java/net/minestom/server/utils/Vector.java @@ -1,14 +1,12 @@ package net.minestom.server.utils; -import net.minestom.server.MinecraftServer; -import net.minestom.server.utils.clone.PublicCloneable; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import java.util.function.DoubleUnaryOperator; /** - * @deprecated use {@link net.minestom.server.utils.coordinate.Vec} instead + * @deprecated use {@link net.minestom.server.coordinate.Vec} instead */ @Deprecated public class Vector implements Point { diff --git a/src/main/java/net/minestom/server/utils/binary/BinaryReader.java b/src/main/java/net/minestom/server/utils/binary/BinaryReader.java index 2b0ab40d0..54cc21629 100644 --- a/src/main/java/net/minestom/server/utils/binary/BinaryReader.java +++ b/src/main/java/net/minestom/server/utils/binary/BinaryReader.java @@ -6,11 +6,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minestom.server.chat.JsonMessage; import net.minestom.server.item.ItemStack; -import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.NBTUtils; import net.minestom.server.utils.SerializerUtils; import net.minestom.server.utils.Utils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import org.jglrxavpok.hephaistos.nbt.NBT; diff --git a/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java b/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java index 849d770f0..6e9ef27bd 100644 --- a/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java +++ b/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java @@ -10,7 +10,7 @@ import net.minestom.server.chat.JsonMessage; import net.minestom.server.item.ItemStack; import net.minestom.server.utils.SerializerUtils; import net.minestom.server.utils.Utils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBTWriter; diff --git a/src/main/java/net/minestom/server/utils/block/BlockIterator.java b/src/main/java/net/minestom/server/utils/block/BlockIterator.java index 42b9fb276..c6ce2d79e 100644 --- a/src/main/java/net/minestom/server/utils/block/BlockIterator.java +++ b/src/main/java/net/minestom/server/utils/block/BlockIterator.java @@ -2,9 +2,9 @@ package net.minestom.server.utils.block; import net.minestom.server.entity.LivingEntity; import net.minestom.server.instance.block.BlockFace; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/src/main/java/net/minestom/server/utils/block/BlockUtils.java b/src/main/java/net/minestom/server/utils/block/BlockUtils.java index a646df469..5c7be31c0 100644 --- a/src/main/java/net/minestom/server/utils/block/BlockUtils.java +++ b/src/main/java/net/minestom/server/utils/block/BlockUtils.java @@ -3,7 +3,7 @@ package net.minestom.server.utils.block; import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; import net.minestom.server.utils.StringUtils; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/net/minestom/server/utils/chunk/ChunkUtils.java b/src/main/java/net/minestom/server/utils/chunk/ChunkUtils.java index 09ba345eb..14a3b3f47 100644 --- a/src/main/java/net/minestom/server/utils/chunk/ChunkUtils.java +++ b/src/main/java/net/minestom/server/utils/chunk/ChunkUtils.java @@ -5,7 +5,7 @@ import net.minestom.server.instance.Instance; import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.MathUtils; import net.minestom.server.utils.callback.OptionalCallback; -import net.minestom.server.utils.coordinate.Point; +import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/utils/entity/EntityUtils.java b/src/main/java/net/minestom/server/utils/entity/EntityUtils.java index 960a18a51..44396cb1a 100644 --- a/src/main/java/net/minestom/server/utils/entity/EntityUtils.java +++ b/src/main/java/net/minestom/server/utils/entity/EntityUtils.java @@ -6,8 +6,8 @@ import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; import net.minestom.server.utils.chunk.ChunkUtils; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; diff --git a/src/main/java/net/minestom/server/utils/location/RelativeLocation.java b/src/main/java/net/minestom/server/utils/location/RelativeLocation.java index 7b647c66a..6ac6f705a 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeLocation.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeLocation.java @@ -2,8 +2,8 @@ package net.minestom.server.utils.location; import net.minestom.server.entity.Entity; import net.minestom.server.utils.Position; -import net.minestom.server.utils.coordinate.Point; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/utils/position/PositionUtils.java b/src/main/java/net/minestom/server/utils/position/PositionUtils.java index 85d8cf293..3b670098b 100644 --- a/src/main/java/net/minestom/server/utils/position/PositionUtils.java +++ b/src/main/java/net/minestom/server/utils/position/PositionUtils.java @@ -1,6 +1,6 @@ package net.minestom.server.utils.position; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import org.jetbrains.annotations.NotNull; public final class PositionUtils { diff --git a/src/test/java/demo/MainDemo.java b/src/test/java/demo/MainDemo.java index fe0d3054b..f48457905 100644 --- a/src/test/java/demo/MainDemo.java +++ b/src/test/java/demo/MainDemo.java @@ -7,7 +7,7 @@ import net.minestom.server.event.player.PlayerLoginEvent; import net.minestom.server.instance.*; import net.minestom.server.instance.batch.ChunkBatch; import net.minestom.server.instance.block.Block; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import net.minestom.server.world.biomes.Biome; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/demo/PlayerInit.java b/src/test/java/demo/PlayerInit.java index 822d15fa2..6fdccb69c 100644 --- a/src/test/java/demo/PlayerInit.java +++ b/src/test/java/demo/PlayerInit.java @@ -30,8 +30,8 @@ import net.minestom.server.item.Material; import net.minestom.server.monitoring.BenchmarkManager; import net.minestom.server.monitoring.TickMonitor; import net.minestom.server.utils.MathUtils; -import net.minestom.server.utils.coordinate.Pos; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; import net.minestom.server.utils.time.TimeUnit; import net.minestom.server.world.DimensionType; diff --git a/src/test/java/demo/commands/TeleportCommand.java b/src/test/java/demo/commands/TeleportCommand.java index f67f8609f..c23b0996d 100644 --- a/src/test/java/demo/commands/TeleportCommand.java +++ b/src/test/java/demo/commands/TeleportCommand.java @@ -8,7 +8,7 @@ import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.entity.Player; import net.minestom.server.utils.Position; -import net.minestom.server.utils.coordinate.Pos; +import net.minestom.server.coordinate.Pos; import net.minestom.server.utils.location.RelativeVec; public class TeleportCommand extends Command { diff --git a/src/test/java/demo/entity/ChickenCreature.java b/src/test/java/demo/entity/ChickenCreature.java index 04af60dfc..2a8b93738 100644 --- a/src/test/java/demo/entity/ChickenCreature.java +++ b/src/test/java/demo/entity/ChickenCreature.java @@ -8,7 +8,7 @@ import net.minestom.server.entity.LivingEntity; import net.minestom.server.entity.ai.goal.RandomStrollGoal; import net.minestom.server.entity.damage.DamageType; import net.minestom.server.event.entity.EntityAttackEvent; -import net.minestom.server.utils.coordinate.Vec; +import net.minestom.server.coordinate.Vec; public class ChickenCreature extends EntityCreature {