From d9c0240b2ac979f8c845080ce37627d3c17201eb Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Fri, 4 Jul 2025 16:38:03 +0200 Subject: [PATCH] use kotlin-graphics/glm My fork was discontinued a long time ago as I am a member of kotlin-graphics for some time and I published pretty much all patches upstream and the new version is published to maven central. --- build.gradle.kts | 6 ++--- .../camera/target/TargetHandlerTest.kt | 2 +- .../minosoft/data/entities/EntityTestUtil.kt | 4 ++-- .../data/entities/entities/EntityTest.kt | 4 ++-- .../entities/player/RemotePlayerEntityTest.kt | 4 ++-- .../minosoft/data/physics/ElytraFlyIT.kt | 4 ++-- .../minosoft/data/physics/PhysicsTestUtil.kt | 2 +- .../minosoft/data/physics/SpectatorTest.kt | 4 ++-- .../data/physics/blocks/bouncing/BounceIT.kt | 2 +- .../physics/blocks/bouncing/HoneyBounceIT.kt | 2 +- .../physics/blocks/bouncing/SlimeBounceIT.kt | 2 +- .../physics/blocks/climbing/ClimbingIT.kt | 2 +- .../data/physics/blocks/slow/PowderSnowIT.kt | 2 +- .../physics/blocks/slow/SlowMovementIT.kt | 2 +- .../data/physics/blocks/walking/WalkIT.kt | 4 ++-- .../physics/enchantments/NoEnchantmentTest.kt | 2 +- .../physics/enchantments/SwiftSneakTest.kt | 2 +- .../physics/fluid/flowing/FlowingFluidIT.kt | 2 +- .../physics/fluid/still/BubbleColumnIT.kt | 2 +- .../data/physics/fluid/still/MixedFluidIT.kt | 2 +- .../data/physics/fluid/still/StillFluidIT.kt | 2 +- .../data/physics/gravity/CollisionIT.kt | 2 +- .../data/physics/gravity/GravityPhysicsIT.kt | 4 ++-- .../data/physics/health/DamageMovementIT.kt | 2 +- .../minosoft/data/physics/input/FlyIT.kt | 2 +- .../minosoft/data/physics/input/JumpIT.kt | 2 +- .../data/physics/input/RotatingTest.kt | 4 ++-- .../minosoft/data/physics/input/SneakIT.kt | 2 +- .../minosoft/data/physics/input/SprintIT.kt | 2 +- .../data/physics/item/ItemEntityIT.kt | 2 +- .../data/physics/parkour/ParkourTick.kt | 4 ++-- .../data/physics/parkour/ParkourUtil.kt | 4 ++-- .../data/physics/potion/BlindnessIT.kt | 2 +- .../data/physics/potion/JumpBoostIT.kt | 2 +- .../data/physics/potion/LevitationIT.kt | 2 +- .../data/physics/potion/PotionExpireIT.kt | 2 +- .../data/physics/potion/SlowFallingIT.kt | 2 +- .../minosoft/data/physics/potion/SpeedIT.kt | 2 +- .../physics/precision/VelocityFlatteningIT.kt | 4 ++-- .../data/physics/riding/AbstractRidingTest.kt | 2 +- .../data/physics/riding/HorseRidingTest.kt | 4 ++-- .../data/physics/riding/PigRidingTest.kt | 2 +- .../data/physics/server/AbilitiesIT.kt | 2 +- .../data/physics/server/ServerVelocityIT.kt | 2 +- .../data/physics/stub/StubPhysicsIT.kt | 4 ++-- .../accessor/VoronoiBiomeAccessorTest.kt | 4 ++-- .../world/chunk/manager/ChunkManagerTest.kt | 2 +- .../rendering/camera/frustum/FrustumTest.kt | 2 +- .../storage/OpenCloseAnimationTest.kt | 4 ++-- .../chunk/mesher/FluidSectionMesherTest.kt | 4 ++-- .../chunk/mesher/SolidSectionMesherTest.kt | 2 +- .../entities/EntityRendererTestUtil.kt | 4 ++-- .../feature/hitbox/HitboxFeatureTest.kt | 2 +- .../text/name/EntityNameFeatureTest.kt | 4 ++-- .../visibility/VisibilityManagerTest.kt | 4 ++-- .../code/RasterizedCodePointRendererTest.kt | 2 +- .../component/ChatComponentRendererTest.kt | 4 ++-- .../component/DummyComponentConsumer.kt | 2 +- .../font/types/bitmap/BitmapFontTypeTest.kt | 6 ++--- .../types/dummy/DummyCodePointRenderer.kt | 4 ++-- .../legacy/LegacyUnicodeFontTypeTest.kt | 4 ++-- .../unicode/unihex/UnihexFontTypeTest.kt | 6 ++--- .../atlas/textures/AtlasTextureManagerTest.kt | 4 ++-- .../gui/elements/text/TextElementTest.kt | 6 ++--- .../gui/mesh/DummyGUIVertexConsumer.kt | 2 +- .../rendering/gui/test/GuiRenderTestUtil.kt | 6 ++--- .../gui/rendering/models/BlockModelTest.kt | 4 ++-- .../models/baked/BakedModelTestUtil.kt | 2 +- .../rendering/models/baked/CuboidBakeTest.kt | 4 ++-- .../models/baked/FaceRotationTest.kt | 4 ++-- .../models/baked/FullCubeBakeTest.kt | 4 ++-- .../rendering/models/baked/LightIndexTest.kt | 4 ++-- .../gui/rendering/models/baked/UVLockTest.kt | 4 ++-- .../models/baked/WeightedModelTest.kt | 2 +- .../baked/rotation/ElementRotationTest.kt | 4 ++-- .../models/baked/rotation/XRotationTest.kt | 4 ++-- .../models/baked/rotation/XYRotationTest.kt | 4 ++-- .../models/baked/rotation/YRotationTest.kt | 4 ++-- .../models/block/state/baked/BakingUtilIT.kt | 4 ++-- .../block/state/baked/cull/FaceCullingTest.kt | 4 ++-- .../state/baked/cull/FacePropertiesTest.kt | 6 ++--- .../state/render/BlockGUIConsumerTest.kt | 4 ++-- .../models/loader/SkeletalLoaderTest.kt | 4 ++-- .../rendering/models/util/CuboidUtilTest.kt | 8 +++---- .../particle/ParticleRendererTest.kt | 2 +- .../world/WorldRendererPipelineTest.kt | 4 ++-- .../keyframe/instance/KeyframeInstanceTest.kt | 4 ++-- .../texture/data/buffer/RGB8BufferTest.kt | 2 +- .../texture/data/buffer/RGBA8BufferTest.kt | 2 +- .../base/texture/skin/SkinManagerTest.kt | 2 +- .../system/dummy/DummyRenderSystem.kt | 2 +- .../system/dummy/buffer/DummyFramebuffer.kt | 4 ++-- .../system/dummy/shader/DummyNativeShader.kt | 8 +++---- .../dummy/texture/DummyStaticTextureArray.kt | 4 ++-- .../system/dummy/texture/DummyTexture.kt | 6 ++--- .../dummy/texture/DummyTextureRenderData.kt | 4 ++-- .../system/window/dummy/DummyWindow.kt | 4 ++-- .../rendering/textures/TextureReadingTest.kt | 2 +- .../properties/AnimationPropertiesTest.kt | 2 +- .../input/interaction/InteractionTestUtil.kt | 4 ++-- .../interaction/breaking/BreakHandlerTest.kt | 2 +- .../input/interaction/long/LongUseBlockIT.kt | 2 +- .../input/interaction/short/BlockPlaceIT.kt | 4 ++-- .../input/interaction/short/BlockUseIT.kt | 4 ++-- .../input/interaction/short/EntityUseIT.kt | 6 ++--- .../input/interaction/short/ItemUseIT.kt | 4 ++-- .../network/session/play/SessionTestUtil.kt | 2 +- .../advancements/AdvancementDisplay.kt | 4 ++-- .../minosoft/camera/target/TargetHandler.kt | 2 +- .../camera/target/targets/BlockTarget.kt | 2 +- .../camera/target/targets/EntityTarget.kt | 4 ++-- .../camera/target/targets/FluidTarget.kt | 2 +- .../camera/target/targets/GenericTarget.kt | 4 ++-- .../minecraft/target/TargetSelectors.kt | 4 ++-- .../selector/EntitySelectorProperties.kt | 4 ++-- .../targets/selector/SelectorEntityTarget.kt | 4 ++-- .../selector/properties/sort/Sorting.kt | 2 +- .../minosoft/data/direction/Directions.kt | 6 ++--- .../data/entities/EntityRenderInfo.kt | 2 +- .../minosoft/data/entities/EntityRotation.kt | 10 ++++----- .../entities/block/CampfireBlockEntity.kt | 2 +- .../entities/block/MobSpawnerBlockEntity.kt | 2 +- .../entities/block/NoteBlockBlockEntity.kt | 2 +- .../data/types/QuaternionEntityDataType.kt | 4 ++-- .../entities/data/types/Vec3EntityDataType.kt | 4 ++-- .../data/types/Vec3fEntityDataType.kt | 4 ++-- .../data/entities/entities/AgeableMob.kt | 4 ++-- .../data/entities/entities/AreaEffectCloud.kt | 6 ++--- .../minosoft/data/entities/entities/Breeze.kt | 4 ++-- .../minosoft/data/entities/entities/Entity.kt | 6 ++--- .../data/entities/entities/ExperienceOrb.kt | 4 ++-- .../data/entities/entities/FlyingMob.kt | 4 ++-- .../entities/entities/InteractionEntity.kt | 4 ++-- .../data/entities/entities/LightningBolt.kt | 2 +- .../data/entities/entities/LivingEntity.kt | 2 +- .../minosoft/data/entities/entities/Mob.kt | 4 ++-- .../data/entities/entities/PathfinderMob.kt | 4 ++-- .../data/entities/entities/TamableAnimal.kt | 4 ++-- .../data/entities/entities/WindCharge.kt | 4 ++-- .../entities/ambient/AmbientCreature.kt | 4 ++-- .../data/entities/entities/ambient/Bat.kt | 4 ++-- .../entities/entities/animal/AbstractGolem.kt | 4 ++-- .../data/entities/entities/animal/Animal.kt | 4 ++-- .../data/entities/entities/animal/Axolotl.kt | 4 ++-- .../data/entities/entities/animal/Bee.kt | 4 ++-- .../data/entities/entities/animal/Cat.kt | 2 +- .../data/entities/entities/animal/Chicken.kt | 4 ++-- .../data/entities/entities/animal/Cow.kt | 4 ++-- .../data/entities/entities/animal/Fox.kt | 4 ++-- .../data/entities/entities/animal/Frog.kt | 4 ++-- .../data/entities/entities/animal/Goat.kt | 4 ++-- .../entities/entities/animal/IronGolem.kt | 4 ++-- .../entities/entities/animal/Mooshroom.kt | 4 ++-- .../data/entities/entities/animal/Ocelot.kt | 4 ++-- .../data/entities/entities/animal/Panda.kt | 4 ++-- .../data/entities/entities/animal/Parrot.kt | 4 ++-- .../data/entities/entities/animal/Pig.kt | 4 ++-- .../entities/entities/animal/PolarBear.kt | 4 ++-- .../data/entities/entities/animal/Rabbit.kt | 4 ++-- .../data/entities/entities/animal/Sheep.kt | 2 +- .../entities/animal/ShoulderRidingAnimal.kt | 4 ++-- .../data/entities/entities/animal/Sniffer.kt | 4 ++-- .../entities/entities/animal/SnowGolem.kt | 4 ++-- .../data/entities/entities/animal/Strider.kt | 4 ++-- .../data/entities/entities/animal/Turtle.kt | 2 +- .../data/entities/entities/animal/Wolf.kt | 2 +- .../entities/entities/animal/hoglin/Hoglin.kt | 4 ++-- .../animal/horse/AbstractChestedHorse.kt | 4 ++-- .../entities/animal/horse/AbstractHorse.kt | 4 ++-- .../entities/entities/animal/horse/Camel.kt | 4 ++-- .../entities/entities/animal/horse/Donkey.kt | 4 ++-- .../entities/entities/animal/horse/Horse.kt | 4 ++-- .../entities/entities/animal/horse/Llama.kt | 4 ++-- .../entities/entities/animal/horse/Mule.kt | 4 ++-- .../entities/animal/horse/SkeletonHorse.kt | 4 ++-- .../entities/animal/horse/TraderLlama.kt | 4 ++-- .../entities/animal/horse/ZombieHorse.kt | 4 ++-- .../entities/animal/water/AbstractFish.kt | 4 ++-- .../animal/water/AbstractSchoolingFish.kt | 4 ++-- .../entities/entities/animal/water/Cod.kt | 4 ++-- .../entities/entities/animal/water/Dolphin.kt | 2 +- .../entities/animal/water/GlowSquid.kt | 4 ++-- .../entities/animal/water/PufferFish.kt | 4 ++-- .../entities/entities/animal/water/Salmon.kt | 4 ++-- .../entities/entities/animal/water/Squid.kt | 4 ++-- .../entities/entities/animal/water/Tadpole.kt | 4 ++-- .../entities/animal/water/TropicalFish.kt | 4 ++-- .../entities/animal/water/WaterAnimal.kt | 4 ++-- .../entities/boss/enderdragon/EndCrystal.kt | 2 +- .../entities/boss/enderdragon/EnderDragon.kt | 4 ++-- .../entities/boss/wither/WitherBoss.kt | 4 ++-- .../entities/decoration/GlowItemFrame.kt | 4 ++-- .../entities/decoration/HangingEntity.kt | 4 ++-- .../entities/entities/decoration/ItemFrame.kt | 4 ++-- .../decoration/LeashFenceKnotEntity.kt | 4 ++-- .../entities/entities/decoration/Marker.kt | 4 ++-- .../entities/entities/decoration/Painting.kt | 2 +- .../decoration/armorstand/ArmorStand.kt | 6 ++--- .../entities/display/BlockDisplayEntity.kt | 4 ++-- .../entities/display/DisplayEntity.kt | 4 ++-- .../entities/display/ItemDisplayEntity.kt | 4 ++-- .../entities/display/TextDisplayEntity.kt | 4 ++-- .../entities/item/FallingBlockEntity.kt | 2 +- .../data/entities/entities/item/ItemEntity.kt | 4 ++-- .../data/entities/entities/item/PrimedTNT.kt | 4 ++-- .../entities/monster/AbstractSkeleton.kt | 4 ++-- .../data/entities/entities/monster/Allay.kt | 4 ++-- .../data/entities/entities/monster/Blaze.kt | 4 ++-- .../entities/entities/monster/CaveSpider.kt | 4 ++-- .../data/entities/entities/monster/Creeper.kt | 4 ++-- .../data/entities/entities/monster/Drowned.kt | 4 ++-- .../entities/monster/ElderGuardian.kt | 4 ++-- .../entities/entities/monster/Enderman.kt | 4 ++-- .../entities/entities/monster/Endermite.kt | 4 ++-- .../entities/entities/monster/EvokerFangs.kt | 4 ++-- .../data/entities/entities/monster/Ghast.kt | 4 ++-- .../data/entities/entities/monster/Giant.kt | 4 ++-- .../entities/entities/monster/Guardian.kt | 4 ++-- .../data/entities/entities/monster/Husk.kt | 4 ++-- .../entities/entities/monster/MagmaCube.kt | 4 ++-- .../data/entities/entities/monster/Monster.kt | 4 ++-- .../entities/monster/PatrollingMonster.kt | 4 ++-- .../data/entities/entities/monster/Phantom.kt | 4 ++-- .../data/entities/entities/monster/Shulker.kt | 2 +- .../entities/entities/monster/Silverfish.kt | 4 ++-- .../entities/entities/monster/Skeleton.kt | 4 ++-- .../data/entities/entities/monster/Slime.kt | 4 ++-- .../data/entities/entities/monster/Spider.kt | 4 ++-- .../data/entities/entities/monster/Stray.kt | 4 ++-- .../data/entities/entities/monster/Vex.kt | 4 ++-- .../data/entities/entities/monster/Warden.kt | 4 ++-- .../entities/monster/WitherSkeleton.kt | 4 ++-- .../data/entities/entities/monster/Zoglin.kt | 4 ++-- .../data/entities/entities/monster/Zombie.kt | 4 ++-- .../entities/monster/ZombieVillager.kt | 4 ++-- .../entities/monster/ZombifiedPiglin.kt | 4 ++-- .../entities/monster/piglin/AbstractPiglin.kt | 4 ++-- .../entities/monster/piglin/Piglin.kt | 4 ++-- .../entities/monster/piglin/PiglinBrute.kt | 4 ++-- .../entities/monster/raid/AbstractIllager.kt | 4 ++-- .../entities/entities/monster/raid/Evoker.kt | 4 ++-- .../entities/monster/raid/Illusioner.kt | 4 ++-- .../entities/monster/raid/Pillager.kt | 4 ++-- .../entities/entities/monster/raid/Raider.kt | 4 ++-- .../entities/entities/monster/raid/Ravager.kt | 4 ++-- .../monster/raid/SpellcasterIllager.kt | 4 ++-- .../entities/monster/raid/Vindicator.kt | 4 ++-- .../entities/entities/monster/raid/Witch.kt | 4 ++-- .../entities/npc/villager/AbstractVillager.kt | 4 ++-- .../entities/npc/villager/Villager.kt | 4 ++-- .../entities/npc/villager/WanderingTrader.kt | 4 ++-- .../entities/entities/player/PlayerEntity.kt | 4 ++-- .../entities/player/RemotePlayerEntity.kt | 4 ++-- .../player/local/LocalPlayerEntity.kt | 2 +- .../player/local/MovementPacketSender.kt | 2 +- .../entities/projectile/AbstractArrow.kt | 4 ++-- .../projectile/AbstractHurtingProjectile.kt | 4 ++-- .../entities/entities/projectile/Arrow.kt | 4 ++-- .../entities/projectile/DragonFireball.kt | 4 ++-- .../entities/entities/projectile/Fireball.kt | 4 ++-- .../projectile/FireworkRocketEntity.kt | 4 ++-- .../entities/projectile/FishingBobber.kt | 4 ++-- .../entities/projectile/LargeFireball.kt | 4 ++-- .../entities/entities/projectile/LlamaSpit.kt | 4 ++-- .../entities/projectile/Projectile.kt | 4 ++-- .../entities/projectile/ShulkerBullet.kt | 4 ++-- .../entities/projectile/SmallFireball.kt | 4 ++-- .../entities/projectile/SpectralArrow.kt | 4 ++-- .../projectile/ThrowableItemProjectile.kt | 4 ++-- .../projectile/ThrowableProjectile.kt | 4 ++-- .../entities/entities/projectile/ThrownEgg.kt | 4 ++-- .../entities/projectile/ThrownEnderPearl.kt | 4 ++-- .../projectile/ThrownExperienceBottle.kt | 4 ++-- .../entities/projectile/ThrownEyeOfEnder.kt | 4 ++-- .../entities/projectile/ThrownPotion.kt | 4 ++-- .../entities/projectile/ThrownSnowball.kt | 4 ++-- .../entities/projectile/ThrownTrident.kt | 4 ++-- .../entities/projectile/WitherSkull.kt | 4 ++-- .../entities/vehicle/AbstractMinecart.kt | 4 ++-- .../vehicle/AbstractMinecartContainer.kt | 4 ++-- .../entities/vehicle/ChestMinecart.kt | 4 ++-- .../entities/vehicle/CommandBlockMinecart.kt | 4 ++-- .../entities/vehicle/FurnaceMinecart.kt | 4 ++-- .../entities/vehicle/HopperMinecart.kt | 4 ++-- .../entities/entities/vehicle/Minecart.kt | 4 ++-- .../entities/vehicle/SpawnerMinecart.kt | 4 ++-- .../entities/entities/vehicle/TNTMinecart.kt | 4 ++-- .../entities/entities/vehicle/boat/Boat.kt | 4 ++-- .../entities/vehicle/boat/ChestBoat.kt | 4 ++-- .../minosoft/data/physics/PhysicsEntity.kt | 4 ++-- .../handler/entity/landing/BouncingHandler.kt | 2 +- .../handler/entity/landing/LandingHandler.kt | 2 +- .../registries/blocks/types/bee/HoneyBlock.kt | 2 +- .../blocks/types/fluid/FluidBlock.kt | 2 +- .../types/fluid/water/BubbleColumnBlock.kt | 2 +- .../blocks/types/pixlyzer/PixLyzerBlock.kt | 2 +- .../types/pixlyzer/RedstoneTorchBlock.kt | 2 +- .../blocks/types/pixlyzer/SlimeBlock.kt | 2 +- .../blocks/types/pixlyzer/TorchBlock.kt | 2 +- .../types/pixlyzer/entity/CampfireBlock.kt | 4 ++-- .../pixlyzer/plant/SweetBerryBushBlock.kt | 2 +- .../pixlyzer/portal/NetherPortalBlock.kt | 2 +- .../types/pixlyzer/snow/PowderSnowBlock.kt | 2 +- .../blocks/types/pixlyzer/wall/LeverBlock.kt | 2 +- .../types/properties/offset/OffsetBlock.kt | 2 +- .../properties/offset/RandomOffsetBlock.kt | 2 +- .../blocks/types/pvp/CobwebBlock.kt | 2 +- .../dimension/effects/DimensionEffects.kt | 4 ++-- .../dimension/effects/minecraft/EndEffects.kt | 4 ++-- .../effects/attributes/EntityAttributes.kt | 2 +- .../entities/DefaultEntityFactories.kt | 4 ++-- .../data/registries/entities/EntityFactory.kt | 4 ++-- .../data/registries/entities/EntityType.kt | 4 ++-- .../minosoft/data/registries/fluid/Fluid.kt | 2 +- .../data/registries/fluid/fluids/LavaFluid.kt | 2 +- .../registries/fluid/fluids/WaterFluid.kt | 2 +- .../world/handler/BlockDestroyedHandler.kt | 2 +- .../data/registries/shapes/aabb/AABB.kt | 8 +++---- .../registries/shapes/aabb/AABBIterator.kt | 2 +- .../shapes/collision/CollisionShape.kt | 2 +- .../registries/shapes/shape/CombinedShape.kt | 2 +- .../data/registries/shapes/shape/Shape.kt | 6 ++--- .../data/registries/shapes/side/SideQuad.kt | 4 ++-- .../events/click/ClickCallbackClickEvent.kt | 4 ++-- .../data/text/events/click/ClickEvent.kt | 4 ++-- .../events/click/CopyToClipboardClickEvent.kt | 4 ++-- .../events/click/InternalCommandClickEvent.kt | 4 ++-- .../text/events/click/OpenFileClickEvent.kt | 4 ++-- .../text/events/click/OpenURLClickEvent.kt | 4 ++-- .../events/click/SendMessageClickEvent.kt | 4 ++-- .../data/text/events/hover/HoverEvent.kt | 4 ++-- .../data/text/events/hover/TextHoverEvent.kt | 4 ++-- .../data/text/formatting/color/Color.kt | 2 +- .../formatting/color/ColorInterpolation.kt | 2 +- .../data/text/formatting/color/RGBAColor.kt | 4 ++-- .../data/text/formatting/color/RGBColor.kt | 2 +- .../data/world/audio/AbstractAudioPlayer.kt | 6 ++--- .../data/world/audio/WorldAudioPlayer.kt | 4 ++-- .../minosoft/data/world/biome/WorldBiomes.kt | 2 +- .../minosoft/data/world/border/WorldBorder.kt | 4 ++-- .../world/chunk/manager/size/WorldSize.kt | 2 +- .../chunk/manager/size/WorldSizeManager.kt | 2 +- .../data/world/entities/WorldEntities.kt | 2 +- .../de/bixilon/minosoft/data/world/map/Map.kt | 4 ++-- .../data/world/positions/BlockPosition.kt | 2 +- .../data/world/positions/BlockPositionUtil.kt | 2 +- .../minosoft/gui/rendering/RenderUtil.kt | 2 +- .../gui/rendering/camera/CameraDefinition.kt | 4 ++-- .../gui/rendering/camera/MatrixHandler.kt | 16 +++++++------- .../gui/rendering/camera/arm/ArmMesh.kt | 2 +- .../gui/rendering/camera/arm/ArmRenderer.kt | 10 ++++----- .../gui/rendering/camera/arm/ArmShader.kt | 4 ++-- .../gui/rendering/camera/frustum/Frustum.kt | 8 +++---- .../camera/occlusion/WorldOcclusionManager.kt | 2 +- .../rendering/camera/shaking/CameraShaking.kt | 6 ++--- .../gui/rendering/camera/view/CameraView.kt | 8 +++---- .../gui/rendering/camera/view/DebugView.kt | 8 +++---- .../camera/view/person/FirstPersonView.kt | 8 +++---- .../camera/view/person/PersonView.kt | 4 ++-- .../camera/view/person/ThirdPersonView.kt | 8 +++---- .../gui/rendering/chunk/ChunkRenderer.kt | 2 +- .../gui/rendering/chunk/WorldQueueItem.kt | 2 +- .../rendering/chunk/border/WorldBorderMesh.kt | 6 ++--- .../chunk/border/WorldBorderRenderer.kt | 2 +- .../chunk/border/WorldBorderShader.kt | 6 ++--- .../chunk/chunk/ChunkBorderRenderer.kt | 4 ++-- .../renderer/sign/SignBlockEntityRenderer.kt | 8 +++---- .../renderer/storage/chest/ChestAnimation.kt | 4 ++-- .../renderer/storage/chest/ChestRenderer.kt | 4 ++-- .../storage/shulker/ShulkerAnimation.kt | 4 ++-- .../storage/shulker/ShulkerBoxRenderer.kt | 2 +- .../chunk/mesh/BlockVertexConsumer.kt | 4 ++-- .../gui/rendering/chunk/mesh/ChunkMesh.kt | 4 ++-- .../gui/rendering/chunk/mesh/ChunkMeshes.kt | 4 ++-- .../gui/rendering/chunk/mesh/VisibleMeshes.kt | 2 +- .../chunk/mesher/FluidSectionMesher.kt | 8 +++---- .../chunk/outline/BlockOutlineRenderer.kt | 2 +- .../chunk/queue/queue/ChunkQueueMaster.kt | 4 ++-- .../gui/rendering/chunk/shader/ChunkShader.kt | 6 ++--- .../entities/easteregg/EntityEasterEggs.kt | 6 ++--- .../entities/feature/SkeletalFeature.kt | 6 ++--- .../entities/feature/block/BlockFeature.kt | 4 ++-- .../entities/feature/block/BlockMesh.kt | 4 ++-- .../entities/feature/block/BlockShader.kt | 6 ++--- .../block/flashing/FlashingBlockFeature.kt | 2 +- .../entities/feature/hitbox/HitboxFeature.kt | 2 +- .../entities/feature/item/ItemFeature.kt | 2 +- .../feature/text/BillboardTextFeature.kt | 6 ++--- .../feature/text/BillboardTextMesh.kt | 2 +- .../feature/text/BillboardTextShader.kt | 6 ++--- .../entities/model/animator/HeadAnimator.kt | 6 ++--- .../model/human/animator/ArmAnimator.kt | 8 +++---- .../model/human/animator/LegAnimator.kt | 4 ++-- .../entities/renderer/EntityRenderer.kt | 4 ++-- .../renderer/living/LivingEntityRenderer.kt | 2 +- .../renderer/living/player/PlayerModelMesh.kt | 4 ++-- .../rendering/entities/util/EntitySpeed.kt | 2 +- .../events/CameraMatrixChangeEvent.kt | 4 ++-- .../events/CameraPositionChangeEvent.kt | 4 ++-- .../gui/rendering/events/ResizeWindowEvent.kt | 4 ++-- .../rendering/events/input/MouseMoveEvent.kt | 4 ++-- .../events/input/MouseScrollEvent.kt | 4 ++-- .../gui/rendering/font/WorldGUIConsumer.kt | 4 ++-- .../code/AscentedCodePointRenderer.kt | 4 ++-- .../font/renderer/code/CodePointRenderer.kt | 2 +- .../code/RasterizedCodePointRenderer.kt | 2 +- .../component/ChatComponentRenderer.kt | 6 ++--- .../component/TextComponentRenderer.kt | 2 +- .../font/renderer/element/TextOffset.kt | 4 ++-- .../font/renderer/element/TextRenderInfo.kt | 4 ++-- .../font/types/bitmap/BitmapCodeRenderer.kt | 4 ++-- .../font/types/bitmap/BitmapFontType.kt | 4 ++-- .../font/types/empty/EmptyCodeRenderer.kt | 2 +- .../font/types/unicode/UnicodeCodeRenderer.kt | 4 ++-- .../unicode/legacy/LegacyUnicodeFontType.kt | 4 ++-- .../types/unicode/unihex/UnifontTexture.kt | 4 ++-- .../rendering/framebuffer/FramebufferMesh.kt | 2 +- .../framebuffer/IntegratedFramebuffer.kt | 4 ++-- .../framebuffer/gui/GUIFramebuffer.kt | 4 ++-- .../framebuffer/world/WorldFramebuffer.kt | 4 ++-- .../world/overlay/overlays/FireOverlay.kt | 2 +- .../overlay/overlays/simple/SimpleOverlay.kt | 2 +- .../overlay/overlays/simple/WallOverlay.kt | 2 +- .../overlays/weather/WeatherOverlay.kt | 4 ++-- .../overlays/weather/WeatherOverlayMesh.kt | 4 ++-- .../minosoft/gui/rendering/gui/GUIRenderer.kt | 4 ++-- .../gui/rendering/gui/atlas/AtlasArea.kt | 4 ++-- .../gui/rendering/gui/atlas/AtlasElement.kt | 6 ++--- .../rendering/gui/atlas/RawAtlasElement.kt | 4 ++-- .../gui/atlas/textures/AtlasTexture.kt | 6 ++--- .../gui/atlas/textures/AtlasTextureManager.kt | 4 ++-- .../gui/atlas/textures/CodeTexturePart.kt | 6 ++--- .../gui/rendering/gui/elements/Element.kt | 4 ++-- .../gui/elements/HorizontalAlignments.kt | 4 ++-- .../rendering/gui/elements/LayoutedElement.kt | 4 ++-- .../gui/elements/VerticalAlignments.kt | 4 ++-- .../input/button/AbstractButtonElement.kt | 6 ++--- .../elements/input/checkbox/SwitchElement.kt | 6 ++--- .../elements/items/ContainerItemsElement.kt | 4 ++-- .../gui/elements/items/ItemElement.kt | 2 +- .../gui/elements/items/RawItemElement.kt | 6 ++--- .../gui/elements/layout/RowLayout.kt | 6 ++--- .../rendering/gui/elements/layout/ZLayout.kt | 4 ++-- .../gui/elements/layout/grid/GridCell.kt | 4 ++-- .../gui/elements/layout/grid/GridLayout.kt | 6 ++--- .../elements/primitive/AtlasImageElement.kt | 4 ++-- .../gui/elements/primitive/ColorElement.kt | 2 +- .../elements/primitive/DynamicImageElement.kt | 2 +- .../gui/elements/primitive/ImageElement.kt | 4 ++-- .../gui/elements/spacer/LineSpacerElement.kt | 4 ++-- .../gui/elements/spacer/SpacerElement.kt | 4 ++-- .../gui/elements/text/TextElement.kt | 4 ++-- .../gui/elements/text/TextFlowElement.kt | 2 +- .../text/background/TextBackground.kt | 2 +- .../elements/text/fade/FadingTextElement.kt | 2 +- .../gui/elements/text/mark/MarkTextElement.kt | 6 ++--- .../gui/elements/util/ProgressElement.kt | 4 ++-- .../gui/rendering/gui/gui/AbstractLayout.kt | 4 ++-- .../gui/rendering/gui/gui/GUIManager.kt | 2 +- .../gui/rendering/gui/gui/GUIMeshElement.kt | 2 +- .../rendering/gui/gui/LayoutedGUIElement.kt | 4 ++-- .../gui/rendering/gui/gui/dragged/Dragged.kt | 4 ++-- .../gui/gui/dragged/DraggedGUIElement.kt | 4 ++-- .../gui/gui/dragged/DraggedManager.kt | 2 +- .../gui/dragged/elements/item/FloatingItem.kt | 4 ++-- .../gui/elements/input/TextInputElement.kt | 4 ++-- .../elements/input/node/NodeErrorElement.kt | 4 ++-- .../input/node/NodeSuggestionsElement.kt | 4 ++-- .../input/node/NodeTextInputElement.kt | 2 +- .../gui/gui/popper/MouseTrackedPopper.kt | 4 ++-- .../gui/rendering/gui/gui/popper/Popper.kt | 2 +- .../gui/gui/popper/PopperGUIElement.kt | 4 ++-- .../rendering/gui/gui/popper/PopperManager.kt | 2 +- .../gui/gui/popper/item/ItemInfoPopper.kt | 4 ++-- .../gui/gui/popper/text/TextPopper.kt | 4 ++-- .../rendering/gui/gui/screen/CreditsScreen.kt | 4 ++-- .../gui/rendering/gui/gui/screen/Screen.kt | 2 +- .../gui/gui/screen/SignEditorScreen.kt | 2 +- .../container/BackgroundedContainerScreen.kt | 4 ++-- .../gui/screen/container/ContainerScreen.kt | 4 ++-- .../container/LabeledContainerScreen.kt | 4 ++-- .../enchanting/EnchantingContainerScreen.kt | 4 ++-- .../enchanting/EnchantmentButtonElement.kt | 6 ++--- .../generic/GenericContainerScreen.kt | 6 ++--- .../smelting/SmeltingContainerScreen.kt | 6 ++--- .../screen/container/text/ContainerText.kt | 4 ++-- .../gui/rendering/gui/gui/screen/menu/Menu.kt | 6 ++--- .../confirmation/AbstractConfirmationMenu.kt | 4 ++-- .../gui/gui/screen/menu/debug/DebugMenu.kt | 6 ++--- .../gui/gui/screen/menu/pause/PauseMenu.kt | 4 ++-- .../gui/gui/screen/menu/pause/RespawnMenu.kt | 2 +- .../hud/elements/bossbar/BossbarElement.kt | 6 ++--- .../gui/hud/elements/bossbar/BossbarLayout.kt | 4 ++-- .../bossbar/BossbarProgressElement.kt | 4 ++-- .../hud/elements/chat/AbstractChatElement.kt | 4 ++-- .../gui/hud/elements/chat/ChatElement.kt | 6 ++--- .../hud/elements/chat/InternalChatElement.kt | 4 ++-- .../hotbar/AbstractHotbarHealthElement.kt | 4 ++-- .../hud/elements/hotbar/HotbarAirElement.kt | 6 ++--- .../hud/elements/hotbar/HotbarBaseElement.kt | 6 ++--- .../hud/elements/hotbar/HotbarCoreElement.kt | 6 ++--- .../gui/hud/elements/hotbar/HotbarElement.kt | 2 +- .../hotbar/HotbarExperienceBarElement.kt | 4 ++-- .../elements/hotbar/HotbarHungerElement.kt | 6 ++--- .../elements/hotbar/HotbarOffhandElement.kt | 6 ++--- .../hotbar/HotbarProtectionElement.kt | 6 ++--- .../hotbar/health/HotbarHealthElement.kt | 4 ++-- .../health/HotbarVehicleHealthElement.kt | 2 +- .../elements/other/PerformanceHUDElement.kt | 4 ++-- .../elements/other/debug/DebugHUDElement.kt | 6 ++--- .../scoreboard/ScoreboardScoreElement.kt | 4 ++-- .../scoreboard/ScoreboardSideElement.kt | 4 ++-- .../gui/hud/elements/tab/TabListElement.kt | 4 ++-- .../hud/elements/tab/TabListEntryElement.kt | 2 +- .../gui/hud/elements/title/TitleElement.kt | 4 ++-- .../gui/hud/elements/wawla/WawlaElement.kt | 4 ++-- .../gui/hud/elements/wawla/WawlaHUDElement.kt | 2 +- .../wawla/block/WawlaBreakProgressElement.kt | 4 ++-- .../gui/rendering/gui/input/DragTarget.kt | 4 ++-- .../rendering/gui/input/DraggableHandler.kt | 4 ++-- .../gui/rendering/gui/input/InputElement.kt | 4 ++-- .../rendering/gui/input/MouseInputElement.kt | 4 ++-- .../gui/rendering/gui/mesh/GUIMesh.kt | 2 +- .../gui/rendering/gui/mesh/GUIMeshCache.kt | 2 +- .../rendering/gui/mesh/GUIVertexConsumer.kt | 2 +- .../gui/rendering/input/CameraInput.kt | 8 +++---- .../gui/rendering/input/InputHandler.kt | 4 ++-- .../gui/rendering/input/count/ClickCounter.kt | 2 +- .../rendering/input/count/KeyClickCounter.kt | 2 +- .../input/count/MouseClickCounter.kt | 2 +- .../input/count/SingleClickCounter.kt | 2 +- .../input/key/manager/InputHandlerManager.kt | 4 ++-- .../input/key/manager/InputManager.kt | 4 ++-- .../gui/rendering/light/LightmapBuffer.kt | 2 +- .../light/updater/DebugLightUpdater.kt | 2 +- .../light/updater/FullbrightLightUpdater.kt | 2 +- .../updater/normal/NormalLightmapUpdater.kt | 2 +- .../models/block/BlockModelPrototype.kt | 2 +- .../models/block/element/ElementRotation.kt | 6 ++--- .../models/block/element/ModelElement.kt | 4 ++-- .../models/block/element/face/FaceUV.kt | 2 +- .../models/block/element/face/ModelFace.kt | 6 ++--- .../state/apply/SingleBlockStateApply.kt | 2 +- .../state/baked/cull/side/FaceProperties.kt | 4 ++-- .../models/block/state/builder/BuiltModel.kt | 2 +- .../block/state/render/BlockGUIConsumer.kt | 10 ++++----- .../models/block/state/render/BlockRender.kt | 2 +- .../block/state/render/PickedBlockRender.kt | 2 +- .../block/state/render/WeightedBlockRender.kt | 2 +- .../property/FullBlockPropertyRenderer.kt | 4 ++-- .../property/PropertyOnlyBlockRender.kt | 2 +- .../models/fluid/fluids/LavaFluidModel.kt | 4 ++-- .../models/fluid/fluids/WaterFluidModel.kt | 4 ++-- .../rendering/models/item/FlatItemRender.kt | 4 ++-- .../models/item/ItemModelPrototype.kt | 2 +- .../gui/rendering/models/item/ItemRender.kt | 2 +- .../models/raw/display/ModelDisplay.kt | 6 ++--- .../gui/rendering/models/util/CuboidUtil.kt | 10 ++++----- .../particle/DefaultParticleBehavior.kt | 4 ++-- .../gui/rendering/particle/ParticleFactory.kt | 4 ++-- .../gui/rendering/particle/ParticleMesh.kt | 6 ++--- .../rendering/particle/ParticleRenderer.kt | 2 +- .../gui/rendering/particle/ParticleShader.kt | 6 ++--- .../gui/rendering/particle/types/Particle.kt | 4 ++-- .../norender/ExplosionEmitterParticle.kt | 4 ++-- .../types/norender/NoRenderParticle.kt | 2 +- .../norender/emitter/EntityEmitterParticle.kt | 6 ++--- .../particle/types/render/RenderParticle.kt | 2 +- .../types/render/texture/TextureParticle.kt | 2 +- .../advanced/AdvancedTextureParticle.kt | 4 ++-- .../advanced/block/BlockDustParticle.kt | 4 ++-- .../texture/simple/AscendingParticle.kt | 4 ++-- .../render/texture/simple/NoteParticle.kt | 4 ++-- .../render/texture/simple/PortalParticle.kt | 4 ++-- .../texture/simple/SimpleTextureParticle.kt | 4 ++-- .../simple/animated/AnimatedParticle.kt | 2 +- .../texture/simple/animated/EndRodParticle.kt | 2 +- .../simple/campfire/CampfireSmokeParticle.kt | 4 ++-- .../texture/simple/cloud/CloudParticle.kt | 2 +- .../texture/simple/cloud/SneezeParticle.kt | 2 +- .../texture/simple/damage/CritParticle.kt | 4 ++-- .../simple/damage/DamageIndicatorParticle.kt | 4 ++-- .../texture/simple/damage/DamageParticle.kt | 4 ++-- .../simple/damage/EnchantedHitParticle.kt | 2 +- .../simple/dust/AbstractDustParticle.kt | 4 ++-- .../texture/simple/dust/DustParticle.kt | 4 ++-- .../simple/emotion/AngryVillagerParticle.kt | 4 ++-- .../texture/simple/emotion/EmotionParticle.kt | 6 ++--- .../texture/simple/emotion/HeartParticle.kt | 4 ++-- .../texture/simple/enchant/EnchantParticle.kt | 4 ++-- .../simple/enchant/EnchantedGlyphParticle.kt | 2 +- .../simple/enchant/NautilusParticle.kt | 4 ++-- .../simple/explosion/ExplosionParticle.kt | 2 +- .../texture/simple/explosion/PoofParticle.kt | 2 +- .../texture/simple/fire/SmokeParticle.kt | 4 ++-- .../texture/simple/lava/LavaParticle.kt | 4 ++-- .../texture/simple/slowing/FlameParticle.kt | 4 ++-- .../texture/simple/slowing/SlowingParticle.kt | 4 ++-- .../simple/slowing/SmallFlameParticle.kt | 4 ++-- .../simple/slowing/SoulFireFlameParticle.kt | 4 ++-- .../spell/AmbientEntityEffectParticle.kt | 2 +- .../simple/spell/EntityEffectParticle.kt | 2 +- .../texture/simple/spell/SpellParticle.kt | 2 +- .../texture/simple/spell/WitchParticle.kt | 2 +- .../simple/suspend/ComposterParticle.kt | 4 ++-- .../texture/simple/suspend/DolphinParticle.kt | 2 +- .../simple/suspend/HappyVillagerParticle.kt | 4 ++-- .../simple/suspend/MyceliumParticle.kt | 4 ++-- .../texture/simple/suspend/SuspendParticle.kt | 4 ++-- .../texture/simple/water/BubbleParticle.kt | 6 ++--- .../simple/water/CrimsonSporeParticle.kt | 2 +- .../simple/water/UnderwaterParticle.kt | 2 +- .../simple/water/WarpedSporeParticle.kt | 4 ++-- .../simple/water/WaterSuspendParticle.kt | 6 ++--- .../rendering/shader/generic/ColorShader.kt | 4 ++-- .../shader/generic/GenericTextureShader.kt | 4 ++-- .../shader/types/CameraPositionShader.kt | 4 ++-- .../shader/types/ViewProjectionShader.kt | 4 ++-- .../gui/rendering/skeletal/SkeletalManager.kt | 4 ++-- .../skeletal/baked/BakedSkeletalTransform.kt | 4 ++-- .../skeletal/baked/SkeletalBakeContext.kt | 4 ++-- .../keyframe/instance/Vec3KeyframeInstance.kt | 4 ++-- .../skeletal/instance/SkeletalInstance.kt | 4 ++-- .../skeletal/instance/TransformInstance.kt | 4 ++-- .../skeletal/mesh/AbstractSkeletalMesh.kt | 2 +- .../rendering/skeletal/mesh/SkeletalMesh.kt | 4 ++-- .../skeletal/mesh/SkeletalMeshUtil.kt | 4 ++-- .../rendering/skeletal/model/SkeletalModel.kt | 4 ++-- .../keyframes/types/RotateKeyframe.kt | 4 ++-- .../keyframes/types/ScaleKeyframe.kt | 4 ++-- .../keyframes/types/TranslateKeyframe.kt | 4 ++-- .../model/elements/SkeletalElement.kt | 6 ++--- .../skeletal/model/elements/SkeletalFace.kt | 4 ++-- .../model/elements/SkeletalRotation.kt | 4 ++-- .../model/textures/SkeletalTexture.kt | 4 ++-- .../model/transforms/SkeletalTransform.kt | 4 ++-- .../skeletal/shader/BaseSkeletalShader.kt | 6 ++--- .../minosoft/gui/rendering/sky/SkyRenderer.kt | 2 +- .../gui/rendering/sky/box/SkyboxColor.kt | 4 ++-- .../rendering/sky/box/SkyboxColorShader.kt | 4 ++-- .../rendering/sky/box/SkyboxTextureMesh.kt | 4 ++-- .../rendering/sky/box/SkyboxTextureShader.kt | 2 +- .../gui/rendering/sky/clouds/CloudArray.kt | 4 ++-- .../gui/rendering/sky/clouds/CloudColor.kt | 4 ++-- .../gui/rendering/sky/clouds/CloudLayer.kt | 2 +- .../gui/rendering/sky/clouds/CloudMesh.kt | 6 ++--- .../gui/rendering/sky/clouds/CloudRenderer.kt | 2 +- .../gui/rendering/sky/clouds/CloudShader.kt | 6 ++--- .../gui/rendering/sky/planet/MoonRenderer.kt | 6 ++--- .../gui/rendering/sky/planet/PlanetMesh.kt | 4 ++-- .../rendering/sky/planet/PlanetRenderer.kt | 12 +++++----- .../gui/rendering/sky/planet/PlanetShader.kt | 6 ++--- .../sky/planet/scatter/SunScatterRenderer.kt | 12 +++++----- .../sky/planet/scatter/SunScatterShader.kt | 6 ++--- .../gui/rendering/sound/AudioPlayer.kt | 4 ++-- .../gui/rendering/sound/SoundListener.kt | 4 ++-- .../gui/rendering/sound/SoundSource.kt | 2 +- .../stats/ExperimentalRenderStats.kt | 2 +- .../gui/rendering/system/base/RenderSystem.kt | 2 +- .../system/base/buffer/frame/Framebuffer.kt | 4 ++-- .../frame/texture/FramebufferTexture.kt | 4 ++-- .../system/base/buffer/render/Renderbuffer.kt | 4 ++-- .../system/base/shader/NativeShader.kt | 10 ++++----- .../system/base/texture/TextureManager.kt | 6 ++--- .../system/base/texture/TexturePart.kt | 6 ++--- .../base/texture/array/StaticTextureArray.kt | 2 +- .../texture/array/TextureArrayProperties.kt | 4 ++-- .../system/base/texture/data/TextureData.kt | 4 ++-- .../base/texture/data/buffer/RGB8Buffer.kt | 2 +- .../base/texture/data/buffer/RGBA8Buffer.kt | 2 +- .../base/texture/data/buffer/TextureBuffer.kt | 2 +- .../data/buffer/TextureBufferFactory.kt | 4 ++-- .../base/texture/dynamic/DynamicTexture.kt | 2 +- .../base/texture/shader/ShaderTexture.kt | 4 ++-- .../system/base/texture/skin/SkinManager.kt | 2 +- .../skin/vanilla/DefaultSkinProvider.kt | 4 ++-- .../base/texture/sprite/SpriteAnimator.kt | 2 +- .../system/base/texture/texture/Texture.kt | 6 ++--- .../base/texture/texture/TextureRenderData.kt | 4 ++-- .../base/texture/texture/file/FileTexture.kt | 4 ++-- .../texture/texture/memory/MemoryTexture.kt | 4 ++-- .../system/opengl/OpenGLNativeShader.kt | 8 +++---- .../system/opengl/OpenGLRenderSystem.kt | 2 +- .../opengl/buffer/frame/OpenGLFramebuffer.kt | 4 ++-- .../texture/OpenGLFramebufferColorTexture.kt | 4 ++-- .../texture/OpenGLFramebufferDepthTexture.kt | 4 ++-- .../buffer/render/OpenGLRenderbuffer.kt | 4 ++-- .../opengl/texture/OpenGLFontTextureArray.kt | 4 ++-- .../opengl/texture/OpenGLTextureArray.kt | 6 ++--- .../opengl/texture/OpenGLTextureData.kt | 4 ++-- .../gui/rendering/system/window/BaseWindow.kt | 6 ++--- .../system/window/glfw/GLFWWindow.kt | 6 ++--- .../gui/rendering/textures/TextureUtil.kt | 2 +- .../properties/AnimationProperties.kt | 4 ++-- .../tints/plants/FoliageTintCalculator.kt | 2 +- .../redstone/RedstoneWireTintCalculator.kt | 2 +- .../gui/rendering/util/ScreenshotTaker.kt | 2 +- .../minosoft/gui/rendering/util/VecUtil.kt | 12 +++++----- .../gui/rendering/util/mat/mat4/Mat4Util.kt | 22 +++++++++---------- .../rendering/util/mesh/GenericColorMesh.kt | 2 +- .../gui/rendering/util/mesh/LineMesh.kt | 4 ++-- .../minosoft/gui/rendering/util/mesh/Mesh.kt | 4 ++-- .../gui/rendering/util/mesh/MeshStruct.kt | 14 ++++++------ .../util/mesh/PositionOnlyMeshStruct.kt | 4 ++-- .../rendering/util/mesh/SimpleTextureMesh.kt | 4 ++-- .../gui/rendering/util/mesh/uv/PackedUV.kt | 2 +- .../gui/rendering/util/vec/vec2/Vec2Util.kt | 4 ++-- .../gui/rendering/util/vec/vec2/Vec2dUtil.kt | 4 ++-- .../gui/rendering/util/vec/vec2/Vec2iUtil.kt | 6 ++--- .../gui/rendering/util/vec/vec3/Vec3Util.kt | 20 ++++++++--------- .../gui/rendering/util/vec/vec3/Vec3dUtil.kt | 8 +++---- .../gui/rendering/util/vec/vec3/Vec3iUtil.kt | 6 ++--- .../gui/rendering/util/vec/vec4/Vec4Util.kt | 6 ++--- .../gui/rendering/util/vec/vec4/Vec4iUtil.kt | 6 ++--- .../breaking/survival/SurvivalDigger.kt | 4 ++-- .../input/interaction/use/ShortUseHandler.kt | 4 ++-- .../bixilon/minosoft/local/LocalConnection.kt | 2 +- .../minosoft/local/storage/DebugStorage.kt | 4 ++-- .../modding/event/events/ExplosionEvent.kt | 4 ++-- .../modding/event/events/PlaySoundEvent.kt | 4 ++-- .../bixilon/minosoft/physics/VanillaMath.kt | 4 ++-- .../physics/entities/BasicPhysicsEntity.kt | 4 ++-- .../physics/entities/EntityPhysics.kt | 2 +- .../entities/item/FallingBlockPhysics.kt | 4 ++-- .../entities/item/ItemEntityPhysics.kt | 2 +- .../physics/entities/item/PrimedTNTPhysics.kt | 4 ++-- .../entities/living/LivingEntityPhysics.kt | 4 ++-- .../entities/living/animal/PigPhysics.kt | 4 ++-- .../entities/living/player/PlayerPhysics.kt | 6 ++--- .../living/player/local/LocalPlayerPhysics.kt | 4 ++-- .../handlers/movement/SneakAdjuster.kt | 4 ++-- .../minosoft/physics/input/MovementInput.kt | 6 ++--- .../physics/parts/CollisionMovementPhysics.kt | 4 ++-- .../minosoft/physics/parts/JumpPhysics.kt | 6 ++--- .../physics/parts/OutOfBlockPusher.kt | 4 ++-- .../physics/parts/climbing/ClimbingPhysics.kt | 2 +- .../physics/parts/elytra/ElytraPhysics.kt | 6 ++--- .../physics/parts/input/InputPhysics.kt | 4 ++-- .../physics/submersion/FluidUpdate.kt | 4 ++-- .../physics/submersion/SubmersionState.kt | 4 ++-- .../c2s/play/block/BlockInteractC2SP.kt | 2 +- .../interact/EntityInteractPositionC2SP.kt | 4 ++-- .../c2s/play/entity/move/PositionC2SP.kt | 4 ++-- .../play/entity/move/PositionRotationC2SP.kt | 4 ++-- .../entity/move/vehicle/MoveVehicleC2SP.kt | 4 ++-- .../s2c/play/entity/move/MoveVehicleS2CP.kt | 4 ++-- .../play/entity/move/MovementRotationS2CP.kt | 4 ++-- .../s2c/play/entity/move/PlayerFaceS2CP.kt | 4 ++-- .../play/entity/move/PositionRotationS2CP.kt | 4 ++-- .../s2c/play/entity/move/RelativeMoveS2CP.kt | 4 ++-- .../s2c/play/entity/move/TeleportS2CP.kt | 4 ++-- .../s2c/play/entity/move/VelocityS2CP.kt | 4 ++-- .../s2c/play/entity/player/HealthS2CP.kt | 4 ++-- .../play/entity/spawn/EntityMobSpawnS2CP.kt | 4 ++-- .../entity/spawn/EntityObjectSpawnS2CP.kt | 2 +- .../s2c/play/entity/spawn/EntityPlayerS2CP.kt | 4 ++-- .../entity/spawn/GlobalEntitySpawnS2CP.kt | 4 ++-- .../protocol/packets/s2c/play/map/MapS2CP.kt | 4 ++-- .../s2c/play/map/legacy/DataLegacyMapS2CP.kt | 2 +- .../s2c/play/map/legacy/PinsLegacyMapS2CP.kt | 4 ++-- .../packets/s2c/play/sound/NamedSoundS2CP.kt | 4 ++-- .../packets/s2c/play/sound/SoundEventS2CP.kt | 4 ++-- .../packets/s2c/play/world/ExplosionS2CP.kt | 2 +- .../packets/s2c/play/world/ParticleS2CP.kt | 6 ++--- .../protocol/protocol/buffers/InByteBuffer.kt | 10 ++++----- .../protocol/buffers/OutByteBuffer.kt | 4 ++-- .../protocol/buffers/play/PlayInByteBuffer.kt | 2 +- .../commands/session/BenchmarkCommand.kt | 4 ++-- .../minosoft/updater/MinosoftUpdater.kt | 7 ++++-- .../java/de/bixilon/minosoft/util/KUtil.kt | 12 +++++----- .../util/json/SkeletalRotationDeserializer.kt | 4 ++-- .../minosoft/util/json/vec/Vec2Serializer.kt | 4 ++-- .../minosoft/util/json/vec/Vec2iSerializer.kt | 4 ++-- .../minosoft/util/json/vec/Vec3Serializer.kt | 4 ++-- .../minosoft/util/json/vec/Vec4Serializer.kt | 4 ++-- .../minosoft/data/direction/DirectionsTest.kt | 2 +- .../data/entities/EntityRotationTest.kt | 4 ++-- .../CombinedShapeLineDrawingTest.kt | 2 +- .../data/registries/shapes/AABBTest.kt | 4 ++-- .../shapes/shape/CombinedShapeTest.kt | 2 +- .../gui/rendering/gui/mesh/GUIMeshTest.kt | 4 ++-- .../block/state/baked/BakingUtilTest.kt | 4 ++-- .../block/state/baked/SkeletalShadeTest.kt | 10 ++++----- .../skeletal/mesh/SkeletalMeshUtilTest.kt | 4 ++-- .../rendering/util/mat/mat4/Mat4UtilTest.kt | 8 +++---- 785 files changed, 1527 insertions(+), 1524 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d7df31983..149808c2a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -218,7 +218,7 @@ testing { // ToDo: Include dependencies from project implementation("de.bixilon:kutil:$kutilVersion") - implementation("de.bixilon:kotlin-glm:$glmVersion") + implementation("io.github.kotlin-graphics:glm:$glmVersion") implementation("it.unimi.dsi:fastutil-core:8.5.15") implementation("de.bixilon:mbf-kotlin:1.0.3") { exclude("com.github.luben", "zstd-jni") } @@ -276,7 +276,7 @@ testing { // ToDo: Include dependencies from project implementation("de.bixilon:kutil:$kutilVersion") - implementation("de.bixilon:kotlin-glm:$glmVersion") + implementation("io.github.kotlin-graphics:glm:$glmVersion") } targets { @@ -367,6 +367,7 @@ dependencies { implementation("org.reflections", "reflections", "0.10.2") implementation("it.unimi.dsi", "fastutil-core", "8.5.15") implementation("org.xeustechnologies", "jcl-core", "2.8") + implementation("io.github.kotlin-graphics", "glm", glmVersion) // ikonli @@ -383,7 +384,6 @@ dependencies { // de.bixilon implementation("de.bixilon", "kutil", kutilVersion) implementation("de.bixilon", "jiibles", "1.1.1") - implementation("de.bixilon", "kotlin-glm", glmVersion) implementation("de.bixilon", "mbf-kotlin", "1.0.3") { exclude("com.github.luben", "zstd-jni") } implementation("de.bixilon.javafx", "javafx-svg", "0.3.1") { exclude("org.openjfx", "javafx-controls") } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/camera/target/TargetHandlerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/camera/target/TargetHandlerTest.kt index b5cbb49a9..ce7e99abd 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/camera/target/TargetHandlerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/camera/target/TargetHandlerTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.BlockTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/EntityTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/EntityTestUtil.kt index 3257d5517..ba9df369a 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/EntityTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/EntityTestUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/EntityTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/EntityTest.kt index 7bdb40d45..b54c982ac 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/EntityTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/EntityTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntityTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntityTest.kt index 466f02544..85b868a21 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntityTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntityTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.player -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.player.additional.PlayerAdditional diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/ElytraFlyIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/ElytraFlyIT.kt index f636db712..13ffbca60 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/ElytraFlyIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/ElytraFlyIT.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.physics -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt index 09089861d..b31b03a88 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.DoubleUtil import de.bixilon.kutil.primitive.DoubleUtil.matches import de.bixilon.kutil.primitive.FloatUtil diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/SpectatorTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/SpectatorTest.kt index 14349acf9..62296a1bc 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/SpectatorTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/SpectatorTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.player.local.Abilities import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/BounceIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/BounceIT.kt index cb1399e5f..48ab8d954 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/BounceIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/BounceIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.bouncing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.physics.PhysicsTestUtil.runTicks diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/HoneyBounceIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/HoneyBounceIT.kt index 84048378f..d89bbcd31 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/HoneyBounceIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/HoneyBounceIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.bouncing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/SlimeBounceIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/SlimeBounceIT.kt index b1424f996..47879c15d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/SlimeBounceIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/bouncing/SlimeBounceIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.bouncing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/climbing/ClimbingIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/climbing/ClimbingIT.kt index 8c05e51e9..0b6bfd2ad 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/climbing/ClimbingIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/climbing/ClimbingIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.climbing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.physics.PhysicsTestUtil.runTicks diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/PowderSnowIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/PowderSnowIT.kt index cefdee682..4e31411f9 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/PowderSnowIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/PowderSnowIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.slow -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/SlowMovementIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/SlowMovementIT.kt index 74a31a0cd..706dfe887 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/SlowMovementIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/slow/SlowMovementIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.blocks.slow -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.physics.PhysicsTestUtil.runTicks diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/walking/WalkIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/walking/WalkIT.kt index 2e3cab7f3..aae0cf815 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/walking/WalkIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/blocks/walking/WalkIT.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.physics.blocks.walking -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/NoEnchantmentTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/NoEnchantmentTest.kt index 2dbc64a5a..724318f77 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/NoEnchantmentTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/NoEnchantmentTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.enchantments -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/SwiftSneakTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/SwiftSneakTest.kt index 6c4226a02..822bd057e 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/SwiftSneakTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/enchantments/SwiftSneakTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.enchantments -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/flowing/FlowingFluidIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/flowing/FlowingFluidIT.kt index 4f695cf99..02ea30f3d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/flowing/FlowingFluidIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/flowing/FlowingFluidIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.fluid.flowing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.physics.PhysicsTestUtil.runTicks diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/BubbleColumnIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/BubbleColumnIT.kt index 7737b1cf1..d35a843b4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/BubbleColumnIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/BubbleColumnIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.fluid.still -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.minosoft.data.entities.Poses diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/MixedFluidIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/MixedFluidIT.kt index 87226ce4c..38fe9f7c7 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/MixedFluidIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/MixedFluidIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.fluid.still -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/StillFluidIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/StillFluidIT.kt index f089fed2a..70b87aa94 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/StillFluidIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/fluid/still/StillFluidIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.fluid.still -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.physics.PhysicsTestUtil.runTicks diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/CollisionIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/CollisionIT.kt index e6f068d48..ab9c179a0 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/CollisionIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/CollisionIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.gravity -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/GravityPhysicsIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/GravityPhysicsIT.kt index 922e17e1f..b80c8909f 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/GravityPhysicsIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/gravity/GravityPhysicsIT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.gravity -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/health/DamageMovementIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/health/DamageMovementIT.kt index 6bf119531..6949a458c 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/health/DamageMovementIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/health/DamageMovementIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.health -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/FlyIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/FlyIT.kt index 0c023cabe..d168e2973 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/FlyIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/FlyIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.input -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.entities.player.local.Abilities import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/JumpIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/JumpIT.kt index a80ff45b3..95eda947d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/JumpIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/JumpIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.input -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/RotatingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/RotatingTest.kt index 7de19232e..f554868ff 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/RotatingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/RotatingTest.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.physics.input -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SneakIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SneakIT.kt index 534806a4a..1489dc832 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SneakIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SneakIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.input -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.Poses import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SprintIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SprintIT.kt index f23f3f3a1..73d791bca 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SprintIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/input/SprintIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.input -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.HealthCondition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertEquals import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/item/ItemEntityIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/item/ItemEntityIT.kt index 8899784ef..a8f9919df 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/item/ItemEntityIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/item/ItemEntityIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourTick.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourTick.kt index 4ce24341c..ee7d5ef46 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourTick.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourTick.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.parkour -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.input.camera.PlayerMovementInput diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourUtil.kt index b5a5532da..ecaac713b 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/parkour/ParkourUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.parkour -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.stream.InputStreamUtil.readAsString import de.bixilon.kutil.string.WhitespaceUtil.trimWhitespaces import de.bixilon.minosoft.commands.parser.brigadier._double.DoubleParser.Companion.readDouble diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/BlindnessIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/BlindnessIT.kt index 22e005790..bb0449701 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/BlindnessIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/BlindnessIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/JumpBoostIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/JumpBoostIT.kt index c957b998d..84f4e4e0f 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/JumpBoostIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/JumpBoostIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/LevitationIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/LevitationIT.kt index 03e418f77..5205c5448 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/LevitationIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/LevitationIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/PotionExpireIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/PotionExpireIT.kt index 4e0c3836d..280ed2b08 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/PotionExpireIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/PotionExpireIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.applySpeed import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertGround import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SlowFallingIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SlowFallingIT.kt index 115d3c01a..3cf345c7a 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SlowFallingIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SlowFallingIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SpeedIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SpeedIT.kt index 926f57f67..f38a146e5 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SpeedIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/potion/SpeedIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.potion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.physics.PhysicsTestUtil.applySlowness import de.bixilon.minosoft.data.physics.PhysicsTestUtil.applySpeed diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/precision/VelocityFlatteningIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/precision/VelocityFlatteningIT.kt index f9375d3c7..2b1335eae 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/precision/VelocityFlatteningIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/precision/VelocityFlatteningIT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.precision -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/AbstractRidingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/AbstractRidingTest.kt index 253fdae7d..2e0c82ce4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/AbstractRidingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/AbstractRidingTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.riding -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/HorseRidingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/HorseRidingTest.kt index 903ddb7c1..f49822344 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/HorseRidingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/HorseRidingTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.riding -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/PigRidingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/PigRidingTest.kt index cf3d96b14..21e48eeb4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/PigRidingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/riding/PigRidingTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.riding -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/AbilitiesIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/AbilitiesIT.kt index aaf7fb499..d4239f9a1 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/AbilitiesIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/AbilitiesIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.server -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.player.local.Abilities import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/ServerVelocityIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/ServerVelocityIT.kt index 7b4c8db19..b5c6b93f9 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/ServerVelocityIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/server/ServerVelocityIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.server -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertVelocity import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/stub/StubPhysicsIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/stub/StubPhysicsIT.kt index 1bc810614..cc6f6d6e6 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/stub/StubPhysicsIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/stub/StubPhysicsIT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics.stub -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.physics.PhysicsTestUtil.assertPosition import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import org.testng.annotations.Test diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/world/biome/accessor/VoronoiBiomeAccessorTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/world/biome/accessor/VoronoiBiomeAccessorTest.kt index 73f81a25f..65ee76a00 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/world/biome/accessor/VoronoiBiomeAccessorTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/world/biome/accessor/VoronoiBiomeAccessorTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.accessor -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3i import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.data.world.biome.accessor.noise.VoronoiBiomeAccessor import de.bixilon.minosoft.test.ITUtil.allocate diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/manager/ChunkManagerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/manager/ChunkManagerTest.kt index 11ce9fbd4..bb06e82d1 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/manager/ChunkManagerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/manager/ChunkManagerTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.chunk.manager -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/camera/frustum/FrustumTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/camera/frustum/FrustumTest.kt index 89e1375c9..566cbab14 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/camera/frustum/FrustumTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/camera/frustum/FrustumTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera.frustum -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.kutil.reflection.ReflectionUtil.getFieldOrNull diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/OpenCloseAnimationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/OpenCloseAnimationTest.kt index aad2d9d88..62a0774f8 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/OpenCloseAnimationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/OpenCloseAnimationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.primitive.FloatUtil.matches import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalModel diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesherTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesherTest.kt index ca9deae23..5f7603adc 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesherTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesherTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesher -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3i import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.minosoft.data.registries.fluid.fluids.LavaFluid import de.bixilon.minosoft.data.registries.fluid.fluids.WaterFluid diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/SolidSectionMesherTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/SolidSectionMesherTest.kt index 341c7fc56..e5895c45b 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/SolidSectionMesherTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/chunk/mesher/SolidSectionMesherTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesher -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.data.container.stack.ItemStack diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/EntityRendererTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/EntityRendererTestUtil.kt index 4b0382a95..39cdc6921 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/EntityRendererTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/EntityRendererTestUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.concurrent.queue.Queue import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeatureTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeatureTest.kt index cd807c401..3d069cb93 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeatureTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeatureTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.hitbox -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.kutil.reflection.ReflectionUtil.getFieldOrNull diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeatureTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeatureTest.kt index 08464576a..226d9b1bb 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeatureTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeatureTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.text.name -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/visibility/VisibilityManagerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/visibility/VisibilityManagerTest.kt index 845e38a88..e1316767c 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/visibility/VisibilityManagerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/entities/visibility/VisibilityManagerTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.visibility -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRendererTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRendererTest.kt index d165c99a0..32d12f181 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRendererTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRendererTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.code -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRendererTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRendererTest.kt index b27603572..b78f2628e 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRendererTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRendererTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.component -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.BaseComponent import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/DummyComponentConsumer.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/DummyComponentConsumer.kt index 022d65a29..db3489cfb 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/DummyComponentConsumer.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/DummyComponentConsumer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.component -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.code.CodePointRenderer diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt index a7cfc3092..5b8dc0627 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.font.types.bitmap -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.gui.rendering.font.types.empty.EmptyCodeRenderer import de.bixilon.minosoft.gui.rendering.system.base.texture.data.TextureData diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/dummy/DummyCodePointRenderer.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/dummy/DummyCodePointRenderer.kt index 93b026369..5a020093f 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/dummy/DummyCodePointRenderer.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/dummy/DummyCodePointRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.dummy -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.code.AscentedCodePointRenderer import de.bixilon.minosoft.gui.rendering.font.renderer.code.AscentedCodePointRenderer.Companion.DEFAULT_ASCENT import de.bixilon.minosoft.gui.rendering.system.dummy.texture.DummyTexture diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontTypeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontTypeTest.kt index 07850fc9d..9b943a4ae 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontTypeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontTypeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.unicode.legacy -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.gui.rendering.font.types.unicode.UnicodeCodeRenderer import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnihexFontTypeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnihexFontTypeTest.kt index 6d9582a23..0a79f230e 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnihexFontTypeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnihexFontTypeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.font.types.unicode.unihex -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.buffer.ByteBufferUtil.readRemaining import de.bixilon.kutil.reflection.ReflectionUtil.getFieldOrNull import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManagerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManagerTest.kt index 5d8e53d72..e4eed2150 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManagerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManagerTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas.textures -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer.RGBA8Buffer import de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer.TextureBuffer diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElementTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElementTest.kt index 6793f84df..52e4b8c88 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElementTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElementTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec4.Vec4 import de.bixilon.minosoft.gui.rendering.font.renderer.component.DummyComponentConsumer import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.gui.elements.text.background.TextBackground diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/mesh/DummyGUIVertexConsumer.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/mesh/DummyGUIVertexConsumer.kt index 1549a8d17..2c622e260 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/mesh/DummyGUIVertexConsumer.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/mesh/DummyGUIVertexConsumer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.system.base.RenderOrder diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/test/GuiRenderTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/test/GuiRenderTestUtil.kt index 4056d28d2..09cc0e39a 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/test/GuiRenderTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/gui/test/GuiRenderTestUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.test -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockModelTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockModelTest.kt index fc700ad5f..837c0b664 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockModelTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockModelTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.block diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTestUtil.kt index d54720c81..329e33e16 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTestUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.kutil.stream.InputStreamUtil.readAll import de.bixilon.minosoft.Minosoft diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/CuboidBakeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/CuboidBakeTest.kt index 00d0df3b9..e007a18f2 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/CuboidBakeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/CuboidBakeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt index 237239484..bcb812ef4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt index f5bed8da9..2d96cbbc1 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/LightIndexTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/LightIndexTest.kt index 9733a718f..6e1657ba9 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/LightIndexTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/LightIndexTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.reflection.ReflectionUtil.getFieldOrNull import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt index c3d63e38d..1cf1ac470 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/WeightedModelTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/WeightedModelTest.kt index f17bd7b23..afda763d0 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/WeightedModelTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/WeightedModelTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.world.positions.BlockPosition diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/ElementRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/ElementRotationTest.kt index d1d26ccfb..4b7b54aee 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/ElementRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/ElementRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt index bd63000b2..fda9ca982 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt index 67e1c3a3f..7444559b9 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt index 79ee2908a..2dba8c51d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilIT.kt index b511c995f..7b5727e91 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilIT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.compactProperties import de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side.FaceProperties import de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side.SideProperties diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCullingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCullingTest.kt index 905529874..159a45d07 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCullingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCullingTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt index 816d21260..f23ec6e23 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumerTest.kt index aa35c8f3c..ce9825ff1 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumerTest.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.direction.Directions diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/loader/SkeletalLoaderTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/loader/SkeletalLoaderTest.kt index 74c1b4be2..bfe7a75b4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/loader/SkeletalLoaderTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/loader/SkeletalLoaderTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.loader -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.latch.SimpleLatch import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtilTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtilTest.kt index b98f08dd2..bbb635b17 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtilTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtilTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.models.util -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.gui.rendering.models.block.element.face.FaceUV import org.testng.Assert.assertEquals diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/particle/ParticleRendererTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/particle/ParticleRendererTest.kt index a6d1ea0ad..d4445bf48 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/particle/ParticleRendererTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/particle/ParticleRendererTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/renderer/renderer/pipeline/world/WorldRendererPipelineTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/renderer/renderer/pipeline/world/WorldRendererPipelineTest.kt index 90dff5a78..e77fdde73 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/renderer/renderer/pipeline/world/WorldRendererPipelineTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/renderer/renderer/pipeline/world/WorldRendererPipelineTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.renderer.renderer.pipeline.world -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/KeyframeInstanceTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/KeyframeInstanceTest.kt index 9cb8a4a3d..c4b6caba8 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/KeyframeInstanceTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/KeyframeInstanceTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance.KeyframeInstance.Companion.NOT_OVER import de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance.KeyframeInstance.Companion.OVER diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8BufferTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8BufferTest.kt index 07bce1566..00f355734 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8BufferTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8BufferTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.rgb import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY_INSTANCE diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8BufferTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8BufferTest.kt index 12c0f8b8e..5f1bf6a27 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8BufferTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8BufferTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.rgb import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY_INSTANCE diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManagerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManagerTest.kt index eb7e4fc13..75138fc55 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManagerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManagerTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.skin -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.kutil.stream.InputStreamUtil.readAll import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/DummyRenderSystem.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/DummyRenderSystem.kt index 13fafff70..e2c2d02cf 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/DummyRenderSystem.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/DummyRenderSystem.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.dummy -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.formatting.color.Colors import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/buffer/DummyFramebuffer.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/buffer/DummyFramebuffer.kt index e128ab2dc..31734e1fa 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/buffer/DummyFramebuffer.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/buffer/DummyFramebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.dummy.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.Framebuffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.FramebufferState import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture.FramebufferTexture diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/shader/DummyNativeShader.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/shader/DummyNativeShader.kt index 28254f7bd..7227d5d22 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/shader/DummyNativeShader.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/shader/DummyNativeShader.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.system.dummy.shader -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyStaticTextureArray.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyStaticTextureArray.kt index bdca413dd..0136d4ecd 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyStaticTextureArray.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyStaticTextureArray.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.dummy.texture -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTexture.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTexture.kt index 3db6257d5..a5c2df843 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTexture.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.dummy.texture -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureStates import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureRenderData.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureRenderData.kt index f038a10e8..0f8a485cf 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureRenderData.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureRenderData.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.dummy.texture -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.TextureRenderData import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.EMPTY diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/window/dummy/DummyWindow.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/window/dummy/DummyWindow.kt index 1e0b40511..31e0d3b05 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/window/dummy/DummyWindow.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/window/dummy/DummyWindow.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.window.dummy -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/TextureReadingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/TextureReadingTest.kt index 861ebe469..fc3b8eede 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/TextureReadingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/TextureReadingTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.textures -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.stream.InputStreamUtil.readAll import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationPropertiesTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationPropertiesTest.kt index 63df47e34..c8175c619 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationPropertiesTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationPropertiesTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.textures.properties -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.assets.util.InputStreamUtil.readJson import org.testng.Assert.assertEquals import org.testng.annotations.Test diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt index 5fcb36cce..92a4d40bf 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.input.interaction -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/breaking/BreakHandlerTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/breaking/BreakHandlerTest.kt index 195d9a6cb..cd8794452 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/breaking/BreakHandlerTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/breaking/BreakHandlerTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.input.interaction.breaking -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/long/LongUseBlockIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/long/LongUseBlockIT.kt index 78e890aa6..9436c2c83 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/long/LongUseBlockIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/long/LongUseBlockIT.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.input.interaction.long -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.BlockTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockPlaceIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockPlaceIT.kt index 297ac6a8d..bb79ac975 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockPlaceIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockPlaceIT.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.input.interaction.short -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.BlockTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockUseIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockUseIT.kt index a19784310..56832ab43 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockUseIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/BlockUseIT.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.input.interaction.short -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.BlockTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt index 8e77391f7..af73fb64d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.input.interaction.short -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.EntityTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/ItemUseIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/ItemUseIT.kt index 19300e4f1..fdb52e984 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/ItemUseIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/ItemUseIT.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.input.interaction.short -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.minosoft.camera.target.targets.BlockTarget diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/session/play/SessionTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/session/play/SessionTestUtil.kt index cf4dd881e..becd6db57 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/session/play/SessionTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/session/play/SessionTestUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.network.session.play -import de.bixilon.kotlinglm.pow +import glm_.pow import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.field import de.bixilon.minosoft.assets.minecraft.MinecraftPackFormat.packFormat diff --git a/src/main/java/de/bixilon/minosoft/advancements/AdvancementDisplay.kt b/src/main/java/de/bixilon/minosoft/advancements/AdvancementDisplay.kt index e7e0a780a..9d76a14f1 100644 --- a/src/main/java/de/bixilon/minosoft/advancements/AdvancementDisplay.kt +++ b/src/main/java/de/bixilon/minosoft/advancements/AdvancementDisplay.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.advancements -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent diff --git a/src/main/java/de/bixilon/minosoft/camera/target/TargetHandler.kt b/src/main/java/de/bixilon/minosoft/camera/target/TargetHandler.kt index f1b3fd355..89234d701 100644 --- a/src/main/java/de/bixilon/minosoft/camera/target/TargetHandler.kt +++ b/src/main/java/de/bixilon/minosoft/camera/target/TargetHandler.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.minosoft.camera.SessionCamera diff --git a/src/main/java/de/bixilon/minosoft/camera/target/targets/BlockTarget.kt b/src/main/java/de/bixilon/minosoft/camera/target/targets/BlockTarget.kt index fe9175b53..c1692d052 100644 --- a/src/main/java/de/bixilon/minosoft/camera/target/targets/BlockTarget.kt +++ b/src/main/java/de/bixilon/minosoft/camera/target/targets/BlockTarget.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target.targets -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/camera/target/targets/EntityTarget.kt b/src/main/java/de/bixilon/minosoft/camera/target/targets/EntityTarget.kt index e72c0d510..8e313cb93 100644 --- a/src/main/java/de/bixilon/minosoft/camera/target/targets/EntityTarget.kt +++ b/src/main/java/de/bixilon/minosoft/camera/target/targets/EntityTarget.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target.targets -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.string.StringUtil.toSnakeCase import de.bixilon.kutil.unsafe.UnsafeUtil.setUnsafeAccessible import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/camera/target/targets/FluidTarget.kt b/src/main/java/de/bixilon/minosoft/camera/target/targets/FluidTarget.kt index fa4fe74ca..7aa5a90a8 100644 --- a/src/main/java/de/bixilon/minosoft/camera/target/targets/FluidTarget.kt +++ b/src/main/java/de/bixilon/minosoft/camera/target/targets/FluidTarget.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target.targets -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.state.PropertyBlockState diff --git a/src/main/java/de/bixilon/minosoft/camera/target/targets/GenericTarget.kt b/src/main/java/de/bixilon/minosoft/camera/target/targets/GenericTarget.kt index 416ba840c..5dc22543f 100644 --- a/src/main/java/de/bixilon/minosoft/camera/target/targets/GenericTarget.kt +++ b/src/main/java/de/bixilon/minosoft/camera/target/targets/GenericTarget.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.camera.target.targets -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions abstract class GenericTarget( diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetSelectors.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetSelectors.kt index 38b975637..d0a85595b 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetSelectors.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetSelectors.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.target -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector.properties.sort.Sorting diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/EntitySelectorProperties.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/EntitySelectorProperties.kt index 4288afcf9..7229fdda8 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/EntitySelectorProperties.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/EntitySelectorProperties.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity data class EntitySelectorProperties( diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/SelectorEntityTarget.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/SelectorEntityTarget.kt index 3bcd679fd..50df7460d 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/SelectorEntityTarget.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/SelectorEntityTarget.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.commands.parser.minecraft.target.TargetSelectors import de.bixilon.minosoft.commands.parser.minecraft.target.targets.CommandEntityTarget import de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector.properties.EntityTargetProperty diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/properties/sort/Sorting.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/properties/sort/Sorting.kt index af0febaf4..6eb3d8a14 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/properties/sort/Sorting.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/targets/selector/properties/sort/Sorting.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector.properties.sort -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt index a1450b61c..b4c583071 100644 --- a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt +++ b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt @@ -12,9 +12,9 @@ */ package de.bixilon.minosoft.data.direction -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.enums.EnumUtil diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt b/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt index 3cc515184..dac3ef0af 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.minosoft.data.Tickable import de.bixilon.minosoft.data.entities.EntityRotation.Companion.interpolateYaw diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityRotation.kt b/src/main/java/de/bixilon/minosoft/data/entities/EntityRotation.kt index 31e863fd8..80816f92e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityRotation.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityRotation.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,10 +12,10 @@ */ package de.bixilon.minosoft.data.entities -import de.bixilon.kotlinglm.func.cos -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.func.sin -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.cos +import glm_.func.rad +import glm_.func.sin +import glm_.vec3.Vec3 import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import kotlin.math.abs diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt index ffd342288..2db60a170 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.primitive.IntUtil.toInt diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt index 8c0326f6f..56bf7de60 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt index 7fdf22ff1..2849c351e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties import de.bixilon.minosoft.data.registries.blocks.properties.Instruments diff --git a/src/main/java/de/bixilon/minosoft/data/entities/data/types/QuaternionEntityDataType.kt b/src/main/java/de/bixilon/minosoft/data/entities/data/types/QuaternionEntityDataType.kt index 02f598b89..edc5261c2 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/data/types/QuaternionEntityDataType.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/data/types/QuaternionEntityDataType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.data.types -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec4.Vec4 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer object QuaternionEntityDataType : EntityDataType { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3EntityDataType.kt b/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3EntityDataType.kt index 21f5d0491..591dbec8b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3EntityDataType.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3EntityDataType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.data.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer object Vec3EntityDataType : EntityDataType { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3fEntityDataType.kt b/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3fEntityDataType.kt index 1b5439f33..f4a0fa049 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3fEntityDataType.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/data/types/Vec3fEntityDataType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.data.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer object Vec3fEntityDataType : EntityDataType { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt index 9c67ebe32..a2f214783 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt index d4d71fd9d..a75b2a851 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Breeze.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Breeze.kt index 5747e3905..7f461bd60 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Breeze.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Breeze.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt index e13d69736..f383ffc2a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt @@ -12,9 +12,9 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.cast.CastUtil.unsafeNull diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt index 457f2bc43..90da6388c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt index d07c51750..885431da6 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/InteractionEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/InteractionEntity.kt index 362ea21da..10171fed7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/InteractionEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/InteractionEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt index a2495308d..29126d91d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.random.RandomUtil.nextInt import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt index cc45ce84a..493080442 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeCast diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt index 9403998df..22f09db75 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt index 6c780aa5a..dbc0f5db7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt index 2ebf52776..5c42fdc7d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/WindCharge.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/WindCharge.kt index 5e2d30d7e..fa6513a66 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/WindCharge.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/WindCharge.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt index fd6ef5d2b..3bb821161 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.ambient -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Mob diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt index bd292d915..e85989c79 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.ambient -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt index 0d756c9e3..61984c25e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.PathfinderMob diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt index 5315d4e41..72f4f9d0f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.AgeableMob diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt index 3e100cb5a..5cdc97655 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt index a41aa76f3..85ed12334 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt index 872712b77..c993df660 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt index 1cea9cbfb..1c5ff7577 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt index 9c735b423..fe03b47f3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt index 0b1237c0e..5c2f761be 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Frog.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Frog.kt index b3561a1b0..0a23b2165 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Frog.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Frog.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt index ff82ce176..c42044b34 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt index cc1960e63..d9a391536 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt index f074bc4b8..73d946112 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt index ffab5bcbd..694d6064a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt index 1db79042e..a7029b767 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt index f08f34319..0cbee0760 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt index d885e443b..d9cf714b2 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt index e210a961d..7d0b18002 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt index 297834baf..738625f40 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt index 0de96f503..aebcce64e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt index 313d21ef9..eac0078ed 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.TamableAnimal diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sniffer.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sniffer.kt index d5717ed5c..e42feb64c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sniffer.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sniffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt index 1814ca279..e31ada83b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt index 05fc45f04..228ee06e1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt index c45b3ecd6..41531b6b0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt index 15193bc80..aa5d3bf81 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt index 429906b51..dc357e0cc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.hoglin -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt index aa057cc3e..83cd64ba1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt index c1696e59c..c3f0a5b65 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Camel.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Camel.kt index 7d15ed09e..c0f723303 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Camel.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Camel.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt index aec3ec3f7..ef371bc44 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt index 75ac767fb..3474dc2f2 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt index 535ddc3eb..9df76ebb1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt index 1d98bc27c..14b8e4747 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt index ffa21b23d..9e60bf62e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt index 17f08342b..c6e318070 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt index ea9cbed53..589756869 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.horse -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt index b751c2ffe..b239819a0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt index c9a677333..57c40a034 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt index 6a42d7102..c46efa1a7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt index fa95183ba..641c035a4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt index a0975d395..ad5978d6e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt index 2d68fe076..19860044a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt index a8cb0de52..2a2c804d8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt index 3c647f3ed..052851367 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Tadpole.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Tadpole.kt index 4188108cb..0832876f8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Tadpole.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Tadpole.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt index afb1f0286..b0050c7fe 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt index 4a5c1a6ab..496d49abb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.animal.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.PathfinderMob diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt index 1e1f8174c..fac314748 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.boss.enderdragon -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt index ef53c27ae..0597a044e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.boss.enderdragon -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt index 43bb0e180..a45021f02 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.boss.wither -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt index 8c2f99a66..10d6bc02a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt index dc8c038fe..e6d8b261e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt index 57ed9ef9c..6a8b10403 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.camera.target.targets.EntityTarget import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt index 3d67e8804..cead056df 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt index 9c7679ce8..5d3bc6e8b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.LivingEntity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt index aa5bee47b..7ad17a895 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/armorstand/ArmorStand.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/armorstand/ArmorStand.kt index 38f7cc798..cf801be0e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/armorstand/ArmorStand.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/armorstand/ArmorStand.kt @@ -12,9 +12,9 @@ */ package de.bixilon.minosoft.data.entities.entities.decoration.armorstand -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.primitive.IntUtil.toInt diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/BlockDisplayEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/BlockDisplayEntity.kt index 098743251..591b6761b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/BlockDisplayEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/BlockDisplayEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.display -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/DisplayEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/DisplayEntity.kt index 452e9aa2b..46c25779e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/DisplayEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/DisplayEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.display -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/ItemDisplayEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/ItemDisplayEntity.kt index 0f4cf0cd1..562e72f25 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/ItemDisplayEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/ItemDisplayEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.display -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/TextDisplayEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/TextDisplayEntity.kt index a5beba23c..d3903d972 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/display/TextDisplayEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/display/TextDisplayEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.display -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlockEntity.kt index 4e7effa68..f0d47c371 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlockEntity.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt index b45ad5d12..6060f73cc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt index 149830143..ffb463dec 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt index 423a3f809..8e33da333 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Allay.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Allay.kt index ed1d3606f..9b5dde314 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Allay.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Allay.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt index 947f785aa..9d0c97cb5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt index a92dbf38c..62fb60cff 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt index e913e2983..e3ab32556 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt index c3f79b141..aed16978d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt index ac060507b..321f08a33 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt index dc4dd5df4..a0a95b92c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt index 14cc54191..a4959a852 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/EvokerFangs.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/EvokerFangs.kt index 17b3e94ff..d16c3ee00 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/EvokerFangs.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/EvokerFangs.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt index ab722814b..62455c180 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt index 4013a2203..66e12c717 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt index 597540dcc..d83c632da 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt index f1956aa4c..fcd1cf02c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt index 3f8d4b1b2..a58590251 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt index 36fc0a4ce..9970095c3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.PathfinderMob diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt index 93f32acc6..3ab70077a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt index c1ab1fa08..6bf4bcd8a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt index fc7affec9..c64136766 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt index f450360d3..9c5b3aeae 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt index 779951ded..79fd37319 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt index f04bc9ce8..054fa5c94 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt index 3d1585696..ab16fa2d9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt index 2310dde14..8e758a698 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt index 994f44d89..0ba69b263 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Warden.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Warden.kt index 472e77713..517825b37 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Warden.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Warden.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt index 4283a402b..c71717a6d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt index 87b6f5b5c..5e3cab4ff 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt index 0a975d87c..ec8d44e0f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt index 7da98b9e4..2f0889a5b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt index 74456f7f6..60261c8f9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt index 15776d45b..5666cf993 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.piglin -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt index 2ea54af56..3a8cadd95 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.piglin -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt index c02b366d2..55a611459 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.piglin -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt index 68cc30a23..1ab73dd91 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt index 5cb7af265..6b885d1f4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt index 1f9e795b7..41801ad94 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt index 4ce157d25..4f2de9f74 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt index 6f9f4f3b4..8b5d19449 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt index a999f5d42..9473e1480 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt index be7a82f05..a8b2d8abc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt index 6b740f3a0..63813fffe 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt index dfd16b3bc..adcbaf063 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.monster.raid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt index 35a188f58..7768e9abc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.npc.villager -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt index e912d4f40..ad5f24729 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.npc.villager -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt index 7da1a3063..562c3d0c1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.npc.villager -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt index 2ee003784..859122aaf 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.data.entities.entities.player -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.json.JsonObject diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt index 69a28f348..ba023687f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.player -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.player.additional.PlayerAdditional diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/LocalPlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/LocalPlayerEntity.kt index 91b529959..225b13858 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/LocalPlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/LocalPlayerEntity.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.player.local -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.minosoft.data.abilities.Gamemodes diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/MovementPacketSender.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/MovementPacketSender.kt index 18b71970a..7150f4679 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/MovementPacketSender.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/MovementPacketSender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.player.local -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.Tickable import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt index 168c32963..d1a6f83ca 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt index 242b789f1..1191d8dc1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt index 9d033432f..8273f700a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt index 28dc4fe79..1d6225574 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt index 7739752d9..35ba8a25b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.ItemStackUtil import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt index 4257df395..c8f6616de 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt index 9f91f21d0..7e21d5eec 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt index 063009ee1..caa21b47a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt index 17a3e0841..23db4130b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt index c3dd310f5..0dace4b18 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt index b176e45a3..5706c663d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt index b258490e4..f3ce3e517 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt index d1d88d5e1..733589bc1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt index 15f6220b4..4e874e996 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.ItemStackUtil import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt index 26589b8b5..2c9146a56 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt index 539f5bf11..8adbe8572 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt index 1340d7c4c..e51337615 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt index bf3eb5a88..9d8836d15 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt index fc3fd7ec7..81714d4d7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.ItemStackUtil import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt index 755f110fb..c147ec906 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt index 095529663..0c933c75f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt index 9ef74518b..425ac535b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt index 6759f4417..38f81fdae 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.projectile -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt index 43461e3c2..2ec4f4a3d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt index e4843e823..ea9326cf2 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityType diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt index a24faf73a..ff3212ae7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt index 8dee44d6a..c69d2e664 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt index 01e36f8b4..c584d059b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.data.EntityDataField diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt index 6b90ad93b..72b245e36 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt index a69b0537c..bcdf4b70a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt index e3ca30591..c30dca088 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt index 173c8b42e..1a956cbcd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/Boat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/Boat.kt index e25e5477a..020bb7fb4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/Boat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/Boat.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle.boat -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/ChestBoat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/ChestBoat.kt index 74059e60b..772da6507 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/ChestBoat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/boat/ChestBoat.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.vehicle.boat -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.registries.entities.EntityFactory diff --git a/src/main/java/de/bixilon/minosoft/data/physics/PhysicsEntity.kt b/src/main/java/de/bixilon/minosoft/data/physics/PhysicsEntity.kt index f1da33e27..8752b81fc 100644 --- a/src/main/java/de/bixilon/minosoft/data/physics/PhysicsEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/physics/PhysicsEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.physics -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.shapes.aabb.AABB @Deprecated("merge with new physics") diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/BouncingHandler.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/BouncingHandler.kt index d138e071c..bf70b3c80 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/BouncingHandler.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/BouncingHandler.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.handler.entity.landing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/LandingHandler.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/LandingHandler.kt index 82f5881e4..7ece3d202 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/LandingHandler.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/handler/entity/landing/LandingHandler.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.handler.entity.landing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.world.positions.BlockPosition diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/bee/HoneyBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/bee/HoneyBlock.kt index ec9978241..5cc0dad74 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/bee/HoneyBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/bee/HoneyBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.bee -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.handler.entity.EntityCollisionHandler diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt index cb7534ae2..585a69acc 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.fluid -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.registries.blocks.light.CustomLightProperties diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/BubbleColumnBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/BubbleColumnBlock.kt index 20c7522f2..284248193 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/BubbleColumnBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/BubbleColumnBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.fluid.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt index 58e1cfb7c..b2668fcca 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.cast.CollectionCast.asAnyMap diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/RedstoneTorchBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/RedstoneTorchBlock.kt index e86159e24..2044a7921 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/RedstoneTorchBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/RedstoneTorchBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties.isLit import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/SlimeBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/SlimeBlock.kt index 1580bd0ff..04a2973b1 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/SlimeBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/SlimeBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.handler.entity.StepHandler diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/TorchBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/TorchBlock.kt index 66bc12a16..f4c31e02c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/TorchBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/TorchBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.types.properties.rendering.RandomDisplayTickable diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/CampfireBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/CampfireBlock.kt index d6a37a4fa..94c751be9 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/CampfireBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/CampfireBlock.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.entity -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.random.RandomUtil.chance import de.bixilon.minosoft.data.entities.block.CampfireBlockEntity diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt index 1d86995a4..9ff108f47 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.plant -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/portal/NetherPortalBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/portal/NetherPortalBlock.kt index 993669809..d08154787 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/portal/NetherPortalBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/portal/NetherPortalBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.portal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt index 43a689767..816dab74d 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.snow -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/wall/LeverBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/wall/LeverBlock.kt index 836e7dc2a..7dee46e83 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/wall/LeverBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/wall/LeverBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.wall -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.random.RandomUtil.chance import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.data.container.stack.ItemStack diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/OffsetBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/OffsetBlock.kt index 0593d469e..04049733d 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/OffsetBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/OffsetBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.properties.offset -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.positions.BlockPosition interface OffsetBlock { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/RandomOffsetBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/RandomOffsetBlock.kt index 92e0d734f..1d1c58dc3 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/RandomOffsetBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/offset/RandomOffsetBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.properties.offset -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.getWorldOffset import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY_INSTANCE diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt index 6eff1bba9..2cf146649 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.pvp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory diff --git a/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/DimensionEffects.kt b/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/DimensionEffects.kt index f346af051..0fdcabcff 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/DimensionEffects.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/DimensionEffects.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.dimension.effects -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.identified.Identified import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/minecraft/EndEffects.kt b/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/minecraft/EndEffects.kt index 771d917a8..e1aa0b432 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/minecraft/EndEffects.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/dimension/effects/minecraft/EndEffects.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.dimension.effects.minecraft -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.registries.dimension.effects.DimensionEffects import de.bixilon.minosoft.data.registries.dimension.effects.FogEffects diff --git a/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/EntityAttributes.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/EntityAttributes.kt index 9fe3ec500..c4ef5aa10 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/EntityAttributes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/EntityAttributes.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.effects.attributes -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.collections.CollectionUtil.lockMapOf import de.bixilon.kutil.collections.map.LockMap import de.bixilon.minosoft.data.registries.effects.attributes.container.AttributeContainer diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/DefaultEntityFactories.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/DefaultEntityFactories.kt index 8e65bfba1..4da9b6dec 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/DefaultEntityFactories.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/DefaultEntityFactories.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.registries.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.* diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt index 8d9eff70f..f5e9a7cba 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt index 457d1eb54..9b7ab218f 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.json.JsonUtil.toJsonObject diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt index a87d4d4ae..c05b57057 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.registries.fluid -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/LavaFluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/LavaFluid.kt index 66f484c88..0e592f257 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/LavaFluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/LavaFluid.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.fluid.fluids -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.random.RandomUtil.chance import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/WaterFluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/WaterFluid.kt index 95f1ef4c8..53cf56896 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/WaterFluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/WaterFluid.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.fluid.fluids -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.random.RandomUtil.chance import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties diff --git a/src/main/java/de/bixilon/minosoft/data/registries/misc/event/world/handler/BlockDestroyedHandler.kt b/src/main/java/de/bixilon/minosoft/data/registries/misc/event/world/handler/BlockDestroyedHandler.kt index 1fd98d717..717845d9e 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/misc/event/world/handler/BlockDestroyedHandler.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/misc/event/world/handler/BlockDestroyedHandler.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.misc.event.world.handler -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.outline.OutlinedBlock import de.bixilon.minosoft.data.registries.identified.ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt index 11fb5a9bd..be6a1ecd7 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.data.registries.shapes.aabb -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.func.common.clamp +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.kutil.collections.iterator.SingleIterator import de.bixilon.kutil.math.simple.DoubleMath.ceil import de.bixilon.kutil.math.simple.DoubleMath.floor diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABBIterator.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABBIterator.kt index d9c89217d..afed448a3 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABBIterator.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABBIterator.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.shapes.aabb -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.chunk.chunk.Chunk import de.bixilon.minosoft.data.world.iterator.WorldIterator diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/collision/CollisionShape.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/collision/CollisionShape.kt index c40808904..186adb227 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/collision/CollisionShape.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/collision/CollisionShape.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.shapes.collision -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.array.ArrayUtil.cast import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.math.simple.DoubleMath.ceil diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShape.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShape.kt index 6c07cbc67..e2fdb73c8 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShape.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShape.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.shapes.shape -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.Axes diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/Shape.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/Shape.kt index aa542801d..f3a78a174 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/Shape.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/shape/Shape.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.registries.shapes.shape -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.registries.shapes.ShapeRegistry diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/side/SideQuad.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/side/SideQuad.kt index 9e4df7156..ea0b3a42b 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/side/SideQuad.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/side/SideQuad.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.registries.shapes.side import com.google.common.base.Objects -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet data class SideQuad( diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickCallbackClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickCallbackClickEvent.kt index 237afc90a..841f46b06 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickCallbackClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickCallbackClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickEvent.kt index 0e872dd9b..f6483caba 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/ClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.events.ChatEvent import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/CopyToClipboardClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/CopyToClipboardClickEvent.kt index d8758bee2..29cbff1a0 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/CopyToClipboardClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/CopyToClipboardClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.confirmation.CopyToClipboardDialog diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/InternalCommandClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/InternalCommandClickEvent.kt index b7e671ffd..2a7646a37 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/InternalCommandClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/InternalCommandClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenFileClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenFileClickEvent.kt index fda44a0ff..a679c3eba 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenFileClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenFileClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.file import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenURLClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenURLClickEvent.kt index 54e275ffa..8a4373623 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenURLClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/OpenURLClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.url.URLUtil.checkWeb import de.bixilon.kutil.url.URLUtil.toURL diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/click/SendMessageClickEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/click/SendMessageClickEvent.kt index ccf137ea8..0033542da 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/click/SendMessageClickEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/click/SendMessageClickEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.click -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.data.registries.factory.name.MultiNameFactory import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/hover/HoverEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/hover/HoverEvent.kt index 5e7138255..65122a51e 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/hover/HoverEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/hover/HoverEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.hover -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.events.ChatEvent import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/hover/TextHoverEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/hover/TextHoverEvent.kt index 96c423541..c3fd51663 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/hover/TextHoverEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/hover/TextHoverEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.events.hover -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Color.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Color.kt index 147b41c84..e62e06ab0 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Color.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Color.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.formatting.color -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.ansi.ANSI interface Color { diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorInterpolation.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorInterpolation.kt index 44f70eeab..27767eed3 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorInterpolation.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorInterpolation.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.text.formatting.color -import de.bixilon.kotlinglm.GLM.PIf +import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.math.interpolation.FloatInterpolation diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBAColor.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBAColor.kt index 676a88a0f..e6293b4d1 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBAColor.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBAColor.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.text.formatting.color -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.kutil.primitive.IntUtil.toHex import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt index 01a2bd709..8d34690bf 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.text.formatting.color -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.TextFormattable diff --git a/src/main/java/de/bixilon/minosoft/data/world/audio/AbstractAudioPlayer.kt b/src/main/java/de/bixilon/minosoft/data/world/audio/AbstractAudioPlayer.kt index 40c3cd2a1..bf78abfdc 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/audio/AbstractAudioPlayer.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/audio/AbstractAudioPlayer.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.world.audio -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.data.world.positions.BlockPositionUtil.center diff --git a/src/main/java/de/bixilon/minosoft/data/world/audio/WorldAudioPlayer.kt b/src/main/java/de/bixilon/minosoft/data/world/audio/WorldAudioPlayer.kt index bb1fc4b2e..60a41cdbc 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/audio/WorldAudioPlayer.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/audio/WorldAudioPlayer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.audio -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation @Deprecated("use world.audio") diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/WorldBiomes.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/WorldBiomes.kt index 8509a045a..ebd1ff1f1 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/WorldBiomes.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/WorldBiomes.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.world.World diff --git a/src/main/java/de/bixilon/minosoft/data/world/border/WorldBorder.kt b/src/main/java/de/bixilon/minosoft/data/world/border/WorldBorder.kt index 17e2bb79a..357554316 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/border/WorldBorder.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/border/WorldBorder.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.world.border -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.world.border.area.BorderArea import de.bixilon.minosoft.data.world.border.area.DynamicBorderArea import de.bixilon.minosoft.data.world.border.area.StaticBorderArea diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSize.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSize.kt index 4cb621991..020b158ed 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSize.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSize.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.chunk.manager.size -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i data class WorldSize( var min: Vec2i = Vec2i(Int.MAX_VALUE, Int.MAX_VALUE), diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSizeManager.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSizeManager.kt index 220ba93ee..49128ce57 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSizeManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/size/WorldSizeManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.chunk.manager.size -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.positions.ChunkPosition import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/data/world/entities/WorldEntities.kt b/src/main/java/de/bixilon/minosoft/data/world/entities/WorldEntities.kt index 0c08f4a70..630e7b6aa 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/entities/WorldEntities.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/entities/WorldEntities.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.concurrent.lock.RWLock import de.bixilon.kutil.observer.set.SetObserver.Companion.observedSet import de.bixilon.minosoft.data.abilities.Gamemodes diff --git a/src/main/java/de/bixilon/minosoft/data/world/map/Map.kt b/src/main/java/de/bixilon/minosoft/data/world/map/Map.kt index 8c591cd5a..55bad24d9 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/map/Map.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/map/Map.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.map -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf import de.bixilon.kutil.collections.map.SynchronizedMap diff --git a/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPosition.kt b/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPosition.kt index 9744c55b3..6737da181 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPosition.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPosition.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.positions -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.text.formatting.TextFormattable diff --git a/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPositionUtil.kt b/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPositionUtil.kt index 60ff01797..c9a4d3278 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPositionUtil.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/positions/BlockPositionUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.positions -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.config.DebugOptions object BlockPositionUtil { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderUtil.kt index 45fe691ad..f4c00be32 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.pool.ThreadPool import de.bixilon.kutil.concurrent.pool.runnable.SimplePoolRunnable diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/CameraDefinition.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/CameraDefinition.kt index 07a4b94c1..fe2f3596c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/CameraDefinition.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/CameraDefinition.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 object CameraDefinition { const val NEAR_PLANE = 0.01f diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/MatrixHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/MatrixHandler.kt index c14ff2ca8..df06d5cf4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/MatrixHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/MatrixHandler.kt @@ -13,12 +13,11 @@ package de.bixilon.minosoft.gui.rendering.camera -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.common.clamp +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.avg._float.FloatAverage import de.bixilon.minosoft.data.world.chunk.ChunkSize import de.bixilon.minosoft.gui.rendering.RenderContext @@ -36,6 +35,7 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.minus import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companion.listen import de.bixilon.minosoft.protocol.network.session.play.tick.Ticks.Companion.ticks import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition +import glm_.glm import kotlin.time.Duration.Companion.milliseconds class MatrixHandler( @@ -88,7 +88,7 @@ class MatrixHandler( if (camera.view.view.shaking) { shaking.transform()?.let { matrix *= it } } - matrix *= GLM.lookAt(position, position + front, CAMERA_UP_VEC3) + matrix *= glm.lookAt(position, position + front, CAMERA_UP_VEC3) this.viewMatrix = matrix } @@ -99,7 +99,7 @@ class MatrixHandler( if (fog.enabled) { far = fog.end * (1.0f / 0.7f) + 2.0f // y axis is weighted differently } - projectionMatrix = GLM.perspective(fov.rad, screenDimensions.x / screenDimensions.y, NEAR_PLANE, maxOf(far, 5.0f)) + projectionMatrix = glm.perspective(fov.rad, screenDimensions.x / screenDimensions.y, NEAR_PLANE, maxOf(far, 5.0f)) } fun init() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmMesh.kt index 9764e945a..ded659fbb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera.arm -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.entities.entities.player.Arms import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.entities.renderer.living.player.PlayerModelMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt index 1a6aed5fd..3a556a42e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt @@ -13,10 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.arm -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.latch.AbstractLatch @@ -40,6 +39,7 @@ import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalModel import de.bixilon.minosoft.gui.rendering.system.base.IntegratedBufferTypes import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companion.listen import de.bixilon.minosoft.protocol.network.session.play.PlaySession +import glm_.glm class ArmRenderer(override val context: RenderContext) : Renderer, Drawable { private var perspective = Mat4() @@ -53,7 +53,7 @@ class ArmRenderer(override val context: RenderContext) : Renderer, Drawable { override fun postInit(latch: AbstractLatch) { shader.load() - context.session.events.listen { perspective = GLM.perspective(60.0f.rad, it.size.aspect, NEAR_PLANE, FALLBACK_FAR_PLANE) } + context.session.events.listen { perspective = glm.perspective(60.0f.rad, it.size.aspect, NEAR_PLANE, FALLBACK_FAR_PLANE) } } private fun registerModels() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmShader.kt index 1dff99995..e82552b59 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera.arm -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.TextureShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/frustum/Frustum.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/frustum/Frustum.kt index 9c601e41c..3e9001580 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/frustum/Frustum.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/frustum/Frustum.kt @@ -14,10 +14,10 @@ package de.bixilon.minosoft.gui.rendering.camera.frustum -import de.bixilon.kotlinglm.mat3x3.Mat3 -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.mat3x3.Mat3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.kutil.collections.CollectionUtil.get import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/occlusion/WorldOcclusionManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/occlusion/WorldOcclusionManager.kt index 0be61824e..94901caef 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/occlusion/WorldOcclusionManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/occlusion/WorldOcclusionManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera.occlusion -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.registries.shapes.aabb.AABB import de.bixilon.minosoft.data.world.chunk.update.WorldUpdateEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/shaking/CameraShaking.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/shaking/CameraShaking.kt index e9540da38..f4b5425fb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/shaking/CameraShaking.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/shaking/CameraShaking.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.shaking -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.swizzle.xz +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 +import glm_.vec3.swizzle.xz import de.bixilon.kutil.avg._float.FloatAverage import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/CameraView.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/CameraView.kt index 5e3371634..047cc1f09 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/CameraView.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/CameraView.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.view -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.input.camera.MovementInputActions diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/DebugView.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/DebugView.kt index 92719b437..66faf3383 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/DebugView.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/DebugView.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.view -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.camera.Camera diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/FirstPersonView.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/FirstPersonView.kt index c5d8541c8..2011ca97a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/FirstPersonView.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/FirstPersonView.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.view.person -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/PersonView.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/PersonView.kt index 0d6a0180b..74e942fb2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/PersonView.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/PersonView.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.camera.view.person -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity import de.bixilon.minosoft.gui.rendering.camera.Camera diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/ThirdPersonView.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/ThirdPersonView.kt index 41d2081a4..e0e5a2ab4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/ThirdPersonView.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/ThirdPersonView.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.camera.view.person -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.camera.Camera diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt index dafdc94bb..9b1ccbe3d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.concurrent.lock.RWLock import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldQueueItem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldQueueItem.kt index 82352dbc8..df6d99717 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldQueueItem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldQueueItem.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.chunk.ChunkSection import de.bixilon.minosoft.data.world.chunk.chunk.Chunk import de.bixilon.minosoft.data.world.positions.SectionPosition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderMesh.kt index b8f007590..9a6d77e08 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderMesh.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.chunk.border -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.border.WorldBorder import de.bixilon.minosoft.data.world.chunk.ChunkSize diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt index 8e5b361f9..3c1b37593 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.border -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderShader.kt index 2a8a02512..6bbadd887 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.border -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.shader.Shader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/chunk/ChunkBorderRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/chunk/ChunkBorderRenderer.kt index e37759f92..816dd6de5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/chunk/ChunkBorderRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/chunk/ChunkBorderRenderer.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.chunk -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.minosoft.config.key.KeyActions import de.bixilon.minosoft.config.key.KeyBinding diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/sign/SignBlockEntityRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/sign/SignBlockEntityRenderer.kt index 26e2a7bd3..af5674b1a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/sign/SignBlockEntityRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/sign/SignBlockEntityRenderer.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.sign -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.func.rad +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.container.stack.ItemStack diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestAnimation.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestAnimation.kt index 28e4b70eb..00110e644 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestAnimation.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestAnimation.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.chest -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.OpenCloseAnimation import de.bixilon.minosoft.gui.rendering.skeletal.instance.SkeletalInstance import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.rotateRadAssign diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestRenderer.kt index be4cc804e..136afbdc6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/ChestRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.chest -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.container.storage.ChestBlockEntity import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties.getFacing diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerAnimation.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerAnimation.kt index 5c80349f8..2f9cc1a68 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerAnimation.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerAnimation.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.shulker -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.OpenCloseAnimation import de.bixilon.minosoft.gui.rendering.skeletal.instance.SkeletalInstance import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.rotateRadAssign diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt index b7a253ce5..468c707b6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.entities.renderer.storage.shulker -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.assets.minecraft.MinecraftPackFormat.FLATTENING import de.bixilon.minosoft.data.colors.DyeColors import de.bixilon.minosoft.data.colors.DyeColors.Companion.name diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/BlockVertexConsumer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/BlockVertexConsumer.kt index 382f6be55..939b425ec 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/BlockVertexConsumer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/BlockVertexConsumer.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.models.block.element.FaceVertexData import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMesh.kt index abb902361..e76dada73 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMeshes.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMeshes.kt index d16ca89c3..b95b81c9e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMeshes.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/ChunkMeshes.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.data.world.chunk.ChunkSize diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/VisibleMeshes.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/VisibleMeshes.kt index 3b6991eee..54b389704 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/VisibleMeshes.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesh/VisibleMeshes.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.concurrent.pool.ThreadPool import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalTask import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalWorker diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt index 8e17d6c49..7ec5f7513 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.chunk.mesher -import de.bixilon.kotlinglm.func.cos -import de.bixilon.kotlinglm.func.sin -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.cos +import glm_.func.sin +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.shapes.collision.context.EmptyCollisionContext import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/outline/BlockOutlineRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/outline/BlockOutlineRenderer.kt index e3da351bd..71bfc1b14 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/outline/BlockOutlineRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/outline/BlockOutlineRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.outline -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/queue/queue/ChunkQueueMaster.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/queue/queue/ChunkQueueMaster.kt index a63b50e8c..9d245b0c3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/queue/queue/ChunkQueueMaster.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/queue/queue/ChunkQueueMaster.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.queue.queue -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.chunk.ChunkSection import de.bixilon.minosoft.data.world.chunk.ChunkSize diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/shader/ChunkShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/shader/ChunkShader.kt index 1934ed112..ea617da6a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/shader/ChunkShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/shader/ChunkShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.shader -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.light.LightmapBuffer import de.bixilon.minosoft.gui.rendering.shader.Shader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/easteregg/EntityEasterEggs.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/easteregg/EntityEasterEggs.kt index 0fcf2983d..a417febc4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/easteregg/EntityEasterEggs.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/easteregg/EntityEasterEggs.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.easteregg -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.SkinParts diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt index 78f456220..913fb4214 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.entities.feature -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.rad +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.gui.rendering.entities.easteregg.EntityEasterEggs.isFlipped import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer import de.bixilon.minosoft.gui.rendering.entities.renderer.living.LivingEntityRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt index 97394b104..b6771b1f2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.block -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.gui.rendering.entities.feature.properties.MeshedFeature diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockMesh.kt index 92b8bfa3c..95f1484dd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.block -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.chunk.mesh.BlockVertexConsumer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockShader.kt index 9a1cd9b67..39fb469b8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.block -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.shader.Shader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockFeature.kt index 16fa85414..154e18c42 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockFeature.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.block.flashing -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt index 11853eee6..ca549b3b1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.hitbox -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.interpolation.Interpolator import de.bixilon.kutil.primitive.FloatUtil.toFloat import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt index 36b052dc6..00672081e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.item -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.kutil.random.RandomUtil.nextFloat import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.gui.rendering.entities.feature.block.BlockMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt index 2f1bfd676..a116ce4d6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.text -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.gui.rendering.entities.feature.properties.MeshedFeature diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextMesh.kt index 09fdeb957..bc0ee1e78 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.text -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextShader.kt index 1461e0910..dccc0db30 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.feature.text -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.shader.Shader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/animator/HeadAnimator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/animator/HeadAnimator.kt index d0995b142..eb89cd8a8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/animator/HeadAnimator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/animator/HeadAnimator.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.model.animator -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.entities.easteregg.EntityEasterEggs.isFlipped import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/ArmAnimator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/ArmAnimator.kt index 33f5bc592..6779dc7ed 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/ArmAnimator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/ArmAnimator.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.entities.model.human.animator -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.func.sin -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.func.sin +import glm_.vec3.Vec3 import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.minosoft.data.entities.entities.player.Arms import de.bixilon.minosoft.gui.rendering.entities.model.human.HumanModel diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/LegAnimator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/LegAnimator.kt index 47637db25..4b60ba94d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/LegAnimator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/human/animator/LegAnimator.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.model.human.animator -import de.bixilon.kotlinglm.func.rad +import glm_.func.rad import de.bixilon.minosoft.gui.rendering.entities.model.human.HumanModel import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.rotateXAssign diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/EntityRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/EntityRenderer.kt index c6290a503..5152a3bec 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/EntityRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/EntityRenderer.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.renderer -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.interpolation.Interpolator import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/LivingEntityRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/LivingEntityRenderer.kt index 153452940..53fc8065c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/LivingEntityRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/LivingEntityRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.renderer.living -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.interpolation.Interpolator import de.bixilon.minosoft.data.entities.Poses import de.bixilon.minosoft.data.entities.entities.LivingEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/player/PlayerModelMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/player/PlayerModelMesh.kt index 241a2f40e..453aca4b9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/player/PlayerModelMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/living/player/PlayerModelMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.entities.renderer.living.player -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.entities.entities.player.SkinParts import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.models.block.element.FaceVertexData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/util/EntitySpeed.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/util/EntitySpeed.kt index 6be757820..6398457a1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/util/EntitySpeed.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/util/EntitySpeed.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.entities.util -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.interpolation.FloatInterpolation import de.bixilon.kutil.math.interpolation.Interpolator import de.bixilon.minosoft.data.entities.entities.Entity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraMatrixChangeEvent.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraMatrixChangeEvent.kt index 7d05c18e0..40958c88e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraMatrixChangeEvent.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraMatrixChangeEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.events -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.gui.rendering.RenderContext class CameraMatrixChangeEvent( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraPositionChangeEvent.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraPositionChangeEvent.kt index 8e339c532..78d2915ae 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraPositionChangeEvent.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/events/CameraPositionChangeEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.events -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.gui.rendering.RenderContext class CameraPositionChangeEvent( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/events/ResizeWindowEvent.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/events/ResizeWindowEvent.kt index be7a5f224..eac1bfff7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/events/ResizeWindowEvent.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/events/ResizeWindowEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.events -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext class ResizeWindowEvent( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseMoveEvent.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseMoveEvent.kt index f67db5f4f..ea6a9c64d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseMoveEvent.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseMoveEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.events.input -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.events.RenderEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseScrollEvent.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseScrollEvent.kt index 8e823a335..67a74f359 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseScrollEvent.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/events/input/MouseScrollEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.events.input -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.events.RenderEvent import de.bixilon.minosoft.modding.event.events.CancelableEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt index 269099ee4..b4285f5ca 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.font -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.chunk.mesh.ChunkMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/AscentedCodePointRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/AscentedCodePointRenderer.kt index 32246067d..e4cc19ba5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/AscentedCodePointRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/AscentedCodePointRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.code -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties /** diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/CodePointRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/CodePointRenderer.kt index 186fda672..ed8ba252b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/CodePointRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/CodePointRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.code -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.enums.BitEnumSet import de.bixilon.minosoft.data.text.formatting.FormattingCodes import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRenderer.kt index fdbee4558..6b35c309c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.code -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.font.renderer.properties.FormattingProperties.BOLD_OFFSET diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRenderer.kt index 526a07801..cb6967718 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRenderer.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.component -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.BaseComponent import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.EmptyComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/TextComponentRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/TextComponentRenderer.kt index d65b922e0..07339bcdc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/TextComponentRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/TextComponentRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.component -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.FormattingCodes import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextOffset.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextOffset.kt index 791a5106a..133c23224 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextOffset.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextOffset.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.element -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.CodePointAddResult import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments.Companion.getOffset diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextRenderInfo.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextRenderInfo.kt index 50fdd8e9d..ec3e599ff 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextRenderInfo.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/element/TextRenderInfo.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.renderer.element -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.EMPTY class TextRenderInfo( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapCodeRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapCodeRenderer.kt index 984fe0718..22843a857 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapCodeRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapCodeRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.bitmap -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.code.AscentedCodePointRenderer import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt index 5ea6e31ed..3f8ac66b3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.bitmap -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.primitive.IntUtil.toInt diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/empty/EmptyCodeRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/empty/EmptyCodeRenderer.kt index 6fb6cbc35..b221e057f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/empty/EmptyCodeRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/empty/EmptyCodeRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.empty -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.code.CodePointRenderer import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/UnicodeCodeRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/UnicodeCodeRenderer.kt index bf001947b..5e246a180 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/UnicodeCodeRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/UnicodeCodeRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.unicode -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.code.RasterizedCodePointRenderer import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontType.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontType.kt index 5d49ee668..79a42c39f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontType.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontType.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.unicode.legacy -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.primitive.IntUtil.toHex diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnifontTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnifontTexture.kt index f309688d3..e23b69c5a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnifontTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/unihex/UnifontTexture.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.font.types.unicode.unihex -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.bit.BitByte.isBit import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/FramebufferMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/FramebufferMesh.kt index d2025c79b..45d07b478 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/FramebufferMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/FramebufferMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.util.mesh.Mesh import de.bixilon.minosoft.gui.rendering.util.mesh.MeshStruct diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/IntegratedFramebuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/IntegratedFramebuffer.kt index 3d283142f..b8c6b59e5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/IntegratedFramebuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/IntegratedFramebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.renderer.drawable.Drawable import de.bixilon.minosoft.gui.rendering.system.base.BlendingFunctions diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/gui/GUIFramebuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/gui/GUIFramebuffer.kt index 8550a83e5..11e9822c7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/gui/GUIFramebuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/gui/GUIFramebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.gui -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.framebuffer.FramebufferMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/WorldFramebuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/WorldFramebuffer.kt index ef25f8012..614f56fec 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/WorldFramebuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/WorldFramebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.framebuffer.FramebufferMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt index 7aa227935..b9a582205 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.registries.fluid.fluids.LavaFluid import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt index b60c4a650..40c280ed6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.simple -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.Overlay diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt index 679f96b9c..b3785e60a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.simple -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.registries.blocks.shapes.collision.context.EntityCollisionContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt index fa8afa12e..f206a3439 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.weather -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.random.RandomUtil.nextFloat import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.kutil.time.TimeUtil.now diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlayMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlayMesh.kt index d7e490dc2..6a7e7614b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlayMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlayMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.weather -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.PrimitiveTypes import de.bixilon.minosoft.gui.rendering.util.mesh.Mesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/GUIRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/GUIRenderer.kt index ea7114984..cbd4ae5f7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/GUIRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/GUIRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.observer.DataObserver.Companion.observed diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasArea.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasArea.kt index d0fb1eb13..4e47cc774 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasArea.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasArea.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.toVec2 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasElement.kt index a0f094cdf..ae2951215 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/AtlasElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.texture.TexturePart import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture import it.unimi.dsi.fastutil.ints.Int2ObjectMap diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/RawAtlasElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/RawAtlasElement.kt index 0da72a24e..695ce8300 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/RawAtlasElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/RawAtlasElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.primitive.IntUtil.toInt diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTexture.kt index fb75b8660..ed1366714 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas.textures -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.RenderUtil.fixUVEnd import de.bixilon.minosoft.gui.rendering.RenderUtil.fixUVStart diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt index 916d2c548..4f9306575 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas.textures -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/CodeTexturePart.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/CodeTexturePart.kt index 0c1ef4a24..5924de94c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/CodeTexturePart.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/CodeTexturePart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.atlas.textures -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.texture.TexturePart import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/Element.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/Element.kt index 5329dc054..086b75947 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/Element.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/Element.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec4.Vec4 import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.input.DragTarget diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/HorizontalAlignments.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/HorizontalAlignments.kt index 59f912d06..61cfdd513 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/HorizontalAlignments.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/HorizontalAlignments.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/LayoutedElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/LayoutedElement.kt index 558dd1e78..cbbc249a5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/LayoutedElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/LayoutedElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 interface LayoutedElement { val layoutOffset: Vec2 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/VerticalAlignments.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/VerticalAlignments.kt index ccf7f2908..eb5baa1ef 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/VerticalAlignments.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/VerticalAlignments.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 enum class VerticalAlignments { TOP, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/button/AbstractButtonElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/button/AbstractButtonElement.kt index d6bbedccd..ab38bb3b8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/button/AbstractButtonElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/button/AbstractButtonElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.input.button -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/checkbox/SwitchElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/checkbox/SwitchElement.kt index 4b623b966..c251e3c32 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/checkbox/SwitchElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/input/checkbox/SwitchElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.input.checkbox -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ContainerItemsElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ContainerItemsElement.kt index 0759ad0d1..0c5593083 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ContainerItemsElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ContainerItemsElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.items -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt index 8b10b7160..8540ec485 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.items -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.container.actions.types.* diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt index 005af64d8..88e0b18d4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.items -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.item.stack.StackableItem diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/RowLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/RowLayout.kt index 86211dad7..c5d95768f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/RowLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/RowLayout.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.layout -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedList import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/ZLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/ZLayout.kt index 769d9fce9..077b34c18 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/ZLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/ZLayout.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.layout -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedList import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridCell.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridCell.kt index 70acfbcb3..af1456312 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridCell.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridCell.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.layout.grid -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec4.Vec4 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIMeshCache diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridLayout.kt index a28bf676e..2a2edb5ba 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/grid/GridLayout.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.layout.grid -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments.Companion.getOffset diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt index f9b547fce..b538af1f6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt index 96a541cad..b457d02da 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt index 7c7495da2..c1e946985 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt index f9e2ab479..ee955ac7f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/LineSpacerElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/LineSpacerElement.kt index 39f91db1e..e21122245 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/LineSpacerElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/LineSpacerElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.spacer -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/SpacerElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/SpacerElement.kt index 94c49eece..9349d0ea4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/SpacerElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/spacer/SpacerElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.spacer -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt index bbf4931b4..5b326c6bf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.language.IntegratedLanguage diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextFlowElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextFlowElement.kt index 2897cde2e..a4eeaafd0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextFlowElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextFlowElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedList import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/background/TextBackground.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/background/TextBackground.kt index 4bdae41e4..aaa05a6a6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/background/TextBackground.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/background/TextBackground.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text.background -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec4.Vec4 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.util.vec.vec4.Vec4Util.marginOf diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/fade/FadingTextElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/fade/FadingTextElement.kt index d4c6890db..6c1343f08 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/fade/FadingTextElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/fade/FadingTextElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text.fade -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt index 5deb70cbd..6d13001de 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text.mark -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/util/ProgressElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/util/ProgressElement.kt index 16b67a4f4..d97f65453 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/util/ProgressElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/util/ProgressElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.util -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/AbstractLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/AbstractLayout.kt index 80938442e..e836c6372 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/AbstractLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/AbstractLayout.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIManager.kt index 4d2f71275..823e95f38 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.concurrent.lock.locks.reentrant.ReentrantRWLock import de.bixilon.kutil.concurrent.pool.DefaultThreadPool diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIMeshElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIMeshElement.kt index 0960c3c8c..e94819744 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIMeshElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIMeshElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/LayoutedGUIElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/LayoutedGUIElement.kt index c11a218df..617b9f50d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/LayoutedGUIElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/LayoutedGUIElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.LayoutedElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/Dragged.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/Dragged.kt index c849adf48..2277b58f8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/Dragged.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/Dragged.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.dragged -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedGUIElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedGUIElement.kt index 24cc767c0..ab050144c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedGUIElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedGUIElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.dragged -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.gui.GUIMeshElement class DraggedGUIElement(element: T) : GUIMeshElement(element) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedManager.kt index cf29840d0..419e83427 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/DraggedManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.dragged -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt index e2aaa5652..a4050a058 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.dragged.elements.item -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.actions.types.SimpleContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/TextInputElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/TextInputElement.kt index 563da1671..43e3b0863 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/TextInputElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/TextInputElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.string.StringUtil.codePointAtOrNull import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.text.TextComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt index d24e6f033..d5c8f389d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input.node -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt index 4bd91a60d..b0fd81f3c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input.node -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.array.ArrayUtil import de.bixilon.minosoft.commands.suggestion.Suggestion import de.bixilon.minosoft.config.key.KeyCodes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeTextInputElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeTextInputElement.kt index b5ebc0950..128473a04 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeTextInputElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeTextInputElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input.node -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.commands.errors.ReaderError import de.bixilon.minosoft.commands.nodes.CommandNode import de.bixilon.minosoft.commands.stack.CommandStack diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/MouseTrackedPopper.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/MouseTrackedPopper.kt index 166f8ef2f..9012a970a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/MouseTrackedPopper.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/MouseTrackedPopper.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt index 7077c0356..7fa956f3b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperGUIElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperGUIElement.kt index 8160f4f7d..002d03da3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperGUIElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperGUIElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.gui.LayoutedGUIElement class PopperGUIElement(popper: Popper) : LayoutedGUIElement(popper) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperManager.kt index 8ec1bcece..8f73b265c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/PopperManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.latch.SimpleLatch import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt index 76d6c5677..5d1f135d6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper.item -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.item.items.DurableItem import de.bixilon.minosoft.data.text.BaseComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/text/TextPopper.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/text/TextPopper.kt index 841fc0a19..7186b38cf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/text/TextPopper.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/text/TextPopper.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper.text -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/CreditsScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/CreditsScreen.kt index fde0c1c23..575f7c123 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/CreditsScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/CreditsScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.registries.misc.event.world.handler.win.WinGameEvent import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt index e3b59ffae..0324c4bf1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/SignEditorScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/SignEditorScreen.kt index 3a77d89d5..d6ec65955 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/SignEditorScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/SignEditorScreen.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.minosoft.config.key.KeyCodes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/BackgroundedContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/BackgroundedContainerScreen.kt index 4d102af01..914ee0eec 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/BackgroundedContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/BackgroundedContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasArea diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/ContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/ContainerScreen.kt index c12f80445..b0308f393 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/ContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/ContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasArea diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/LabeledContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/LabeledContainerScreen.kt index 7e6e9f75d..77bda8372 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/LabeledContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/LabeledContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasArea diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantingContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantingContainerScreen.kt index 31ece0a77..dc656653e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantingContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantingContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.enchanting -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.container.types.EnchantingContainer import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt index b4cae5031..114c7eed6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.enchanting -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.enchantment.Enchantment import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/generic/GenericContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/generic/GenericContainerScreen.kt index 36cb18023..ab6ad20b1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/generic/GenericContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/generic/GenericContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.generic -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.container.types.generic.GenericContainer import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/processing/smelting/SmeltingContainerScreen.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/processing/smelting/SmeltingContainerScreen.kt index 5d9dcc5b2..e41919276 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/processing/smelting/SmeltingContainerScreen.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/processing/smelting/SmeltingContainerScreen.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.processing.smelting -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.minosoft.data.container.types.processing.smelting.SmeltingContainer import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt index b5a3ee871..9ed8b5c1c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.text -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/Menu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/Menu.kt index 943dc9fc3..75f9084ce 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/Menu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/Menu.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt index c49a4a657..81e2a1045 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.confirmation -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/debug/DebugMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/debug/DebugMenu.kt index 63f4cebe4..652431499 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/debug/DebugMenu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/debug/DebugMenu.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.debug -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.world.weather.WorldWeather diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt index e845ee6f9..00224dc00 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.pause -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.shutdown.ShutdownManager import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager import de.bixilon.minosoft.data.language.LanguageUtil.i18n diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt index ef27065e9..7533ef259 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.pause -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarElement.kt index b86a9c954..c8c4b3b21 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.bossbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.array.ArrayUtil.cast import de.bixilon.minosoft.data.bossbar.Bossbar import de.bixilon.minosoft.data.bossbar.BossbarColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarLayout.kt index 1b7d14e9e..7d01686bf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarLayout.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.bossbar -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf import de.bixilon.minosoft.data.bossbar.Bossbar import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarProgressElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarProgressElement.kt index 0f3c39e04..ee6423d25 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarProgressElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/bossbar/BossbarProgressElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.bossbar -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.AtlasImageElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/AbstractChatElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/AbstractChatElement.kt index 68edc3d64..0293ebcfd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/AbstractChatElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/AbstractChatElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextFlowElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt index 5fc95a1b7..fecd9d09f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.commands.nodes.ChatNode import de.bixilon.minosoft.config.key.KeyActions import de.bixilon.minosoft.config.key.KeyBinding diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalChatElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalChatElement.kt index 715b05e48..f2196f372 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalChatElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalChatElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.minosoft.data.chat.message.internal.InternalChatMessage import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt index 071745469..ea31d8a67 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.math.simple.FloatMath.ceil import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarAirElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarAirElement.kt index 21f89ac78..1b087881a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarAirElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarAirElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.math.simple.FloatMath.ceil import de.bixilon.minosoft.data.registries.fluid.fluids.WaterFluid import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarBaseElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarBaseElement.kt index 53a7d4658..548e3555a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarBaseElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarBaseElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.container.types.PlayerInventory import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt index 256364b52..8479a9cdb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarElement.kt index 85bee1f80..41aeab118 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.chat.ChatTextPositions import de.bixilon.minosoft.data.container.equipment.EquipmentSlots diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarExperienceBarElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarExperienceBarElement.kt index d46d7e6d0..b01f90e84 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarExperienceBarElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarExperienceBarElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt index b377bd33a..a6a851a26 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.registries.effects.other.OtherEffect import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarOffhandElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarOffhandElement.kt index ce4d5674f..a577e47a9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarOffhandElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarOffhandElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.entities.entities.player.Arms import de.bixilon.minosoft.data.entities.entities.player.Arms.Companion.opposite import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarProtectionElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarProtectionElement.kt index ac7af2d3f..bca36754f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarProtectionElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarProtectionElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.item.items.armor.DefendingArmorItem.Companion.getProtection import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarHealthElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarHealthElement.kt index f5f4b74f1..6b527e243 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarHealthElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarHealthElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar.health -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.math.simple.FloatMath.rounded10 import de.bixilon.minosoft.data.registries.effects.attributes.MinecraftAttributes import de.bixilon.minosoft.data.registries.effects.damage.DamageEffect diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarVehicleHealthElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarVehicleHealthElement.kt index f1b060886..03de2bae1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarVehicleHealthElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/health/HotbarVehicleHealthElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar.health -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.math.simple.FloatMath.rounded10 import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.registries.effects.attributes.MinecraftAttributes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/PerformanceHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/PerformanceHUDElement.kt index a40478747..2fc335cd5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/PerformanceHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/PerformanceHUDElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.other -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.math.simple.DoubleMath.rounded10 import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt index 1bb92d8db..630c07598 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.other.debug -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i +import glm_.vec4.Vec4 import de.bixilon.kutil.concurrent.Reference import de.bixilon.kutil.math.simple.DoubleMath.rounded10 import de.bixilon.kutil.math.simple.FloatMath.rounded10 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt index 8e15ddb1a..fe853e688 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.scoreboard -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.scoreboard.ScoreboardScore import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardSideElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardSideElement.kt index ec78cc25b..6f4ba5d0f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardSideElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardSideElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.scoreboard -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.CollectionUtil.lockMapOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedMap import de.bixilon.kutil.collections.map.LockMap diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt index 076642194..361e8515f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.tab -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedMap import de.bixilon.kutil.observer.DataObserver.Companion.observe diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt index a75df0f90..8d13d99f6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.tab -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.minosoft.data.abilities.Gamemodes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/title/TitleElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/title/TitleElement.kt index cbeff556a..4127877f3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/title/TitleElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/title/TitleElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.title -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt index 78e2831f2..0aed7da67 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.wawla -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.registries.identified.Identified import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaHUDElement.kt index 3d91b2ff2..818eaa464 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaHUDElement.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.wawla -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.camera.target.targets.EntityTarget import de.bixilon.minosoft.data.registries.identified.ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/WawlaBreakProgressElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/WawlaBreakProgressElement.kt index 0df4f21b5..eef8d0c1f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/WawlaBreakProgressElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/WawlaBreakProgressElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.wawla.block -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.ColorElement diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DragTarget.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DragTarget.kt index dd2dae984..0b7af002f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DragTarget.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DragTarget.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.input -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.elements.Element diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DraggableHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DraggableHandler.kt index 0191e9b72..38a34f758 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DraggableHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/DraggableHandler.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.input -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.elements.Element import de.bixilon.minosoft.gui.rendering.gui.gui.dragged.Dragged diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputElement.kt index a820ada53..7fca28eb2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.input -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseInputElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseInputElement.kt index 8a0925782..5974ffaaf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseInputElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseInputElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.input -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 interface MouseInputElement { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt index 70a3d594f..04c50ade1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.primitive.floats.AbstractFloatList import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt index 082c5cf8e..94c18640e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.collections.primitive.floats.AbstractFloatList import de.bixilon.kutil.collections.primitive.floats.HeapArrayFloatList import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt index 6bad0fe1d..58ea63110 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.font.renderer.properties.FontProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/CameraInput.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/CameraInput.kt index 32177123b..9c9234081 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/CameraInput.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/CameraInput.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.minosoft.config.key.KeyActions import de.bixilon.minosoft.config.key.KeyBinding import de.bixilon.minosoft.config.key.KeyCodes @@ -26,6 +25,7 @@ import de.bixilon.minosoft.gui.rendering.camera.MatrixHandler import de.bixilon.minosoft.input.camera.MovementInputActions import de.bixilon.minosoft.input.camera.PlayerMovementInput import de.bixilon.minosoft.util.KUtil.toResourceLocation +import glm_.glm class CameraInput( private val context: RenderContext, @@ -122,7 +122,7 @@ class CameraInput( yaw += CIRCLE_DEGREE } yaw %= HALF_CIRCLE_DEGREE - val pitch = GLM.clamp(delta.y + rotation.pitch, -89.9, 89.9) + val pitch = glm.clamp(delta.y + rotation.pitch, -89.9, 89.9) return EntityRotation(yaw.toFloat(), pitch.toFloat()) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/InputHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/InputHandler.kt index 1496132b2..c777e4747 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/InputHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/InputHandler.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.gui.rendering.system.window.KeyChangeTypes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/ClickCounter.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/ClickCounter.kt index c37f12492..7ce6fd26b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/ClickCounter.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/ClickCounter.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input.count -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.kutil.time.TimeUtil.now diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/KeyClickCounter.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/KeyClickCounter.kt index 9703ac373..53740b3fd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/KeyClickCounter.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/KeyClickCounter.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input.count -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons import kotlin.time.TimeSource.Monotonic.ValueTimeMark diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/MouseClickCounter.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/MouseClickCounter.kt index b286b0963..7ea657b8c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/MouseClickCounter.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/MouseClickCounter.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input.count -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons import kotlin.time.TimeSource.Monotonic.ValueTimeMark diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/SingleClickCounter.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/SingleClickCounter.kt index e17eeb998..37e00790f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/SingleClickCounter.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/count/SingleClickCounter.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input.count -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.abs diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputHandlerManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputHandlerManager.kt index 637719581..81c9dd38f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputHandlerManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputHandlerManager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.input.key.manager -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.config.key.KeyCodes.Companion.isPrintable import de.bixilon.minosoft.gui.rendering.input.InputHandler diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputManager.kt index 43c24668b..e744e361b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/InputManager.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.input.key.manager -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2 +import glm_.vec2.Vec2d import de.bixilon.kutil.enums.BitEnumSet import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.config.key.KeyCodes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/light/LightmapBuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/light/LightmapBuffer.kt index 3e6c571c9..fcb9afc96 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/light/LightmapBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/light/LightmapBuffer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.light -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.data.world.chunk.light.types.LightLevel import de.bixilon.minosoft.gui.rendering.system.base.RenderSystem diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/DebugLightUpdater.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/DebugLightUpdater.kt index 170d9830e..2f3d7dcf5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/DebugLightUpdater.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/DebugLightUpdater.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.light.updater -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.chunk.light.types.LightLevel import de.bixilon.minosoft.gui.rendering.light.LightmapBuffer import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/FullbrightLightUpdater.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/FullbrightLightUpdater.kt index 5d1390596..603290760 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/FullbrightLightUpdater.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/FullbrightLightUpdater.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.light.updater -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.world.chunk.light.types.LightLevel import de.bixilon.minosoft.gui.rendering.light.LightmapBuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/normal/NormalLightmapUpdater.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/normal/NormalLightmapUpdater.kt index 60f3c00cf..5a2574c1a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/normal/NormalLightmapUpdater.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/light/updater/normal/NormalLightmapUpdater.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.light.updater.normal -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.observer.DataObserver.Companion.observe diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModelPrototype.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModelPrototype.kt index 42f17e28d..a1d37c4d1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModelPrototype.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModelPrototype.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ElementRotation.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ElementRotation.kt index fa1b3f574..798e638cb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ElementRotation.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ElementRotation.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.block.element -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.vec3.Vec3 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.primitive.FloatUtil.toFloat diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ModelElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ModelElement.kt index 0cdde7100..9f56bfce9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ModelElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/ModelElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.element -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.json.JsonUtil.toJsonObject diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/FaceUV.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/FaceUV.kt index 402a1495a..b041985db 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/FaceUV.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/FaceUV.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.element.face -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement.Companion.BLOCK_SIZE import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.pushRight diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt index ab0c6c9e9..b4c20ba81 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.block.element.face -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.Axes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt index 7b7f81b8a..2379dbaba 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.apply -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.primitive.FloatUtil.toFloat diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/side/FaceProperties.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/side/FaceProperties.kt index 74a64717b..b81228f6b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/side/FaceProperties.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/side/FaceProperties.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies data class FaceProperties( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/builder/BuiltModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/builder/BuiltModel.kt index 642ad4773..ab5739cc0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/builder/BuiltModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/builder/BuiltModel.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.builder -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumer.kt index c5d84afc9..624a571c8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockGUIConsumer.kt @@ -13,10 +13,9 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.camera.CameraDefinition @@ -29,6 +28,7 @@ import de.bixilon.minosoft.gui.rendering.models.raw.display.ModelDisplay import de.bixilon.minosoft.gui.rendering.system.base.texture.shader.ShaderTexture import de.bixilon.minosoft.gui.rendering.util.mesh.uv.PackedUV import de.bixilon.minosoft.gui.rendering.util.mesh.uv.UnpackedUV +import glm_.glm class BlockGUIConsumer( val gui: GUIRenderer, @@ -68,6 +68,6 @@ class BlockGUIConsumer( } companion object { - val VIEW_MATRIX = GLM.lookAt(Vec3(0.0f, 0.0f, -1.0f), Vec3(0.0f, 0.0f, 1.0f), CameraDefinition.CAMERA_UP_VEC3) + val VIEW_MATRIX = glm.lookAt(Vec3(0.0f, 0.0f, -1.0f), Vec3(0.0f, 0.0f, 1.0f), CameraDefinition.CAMERA_UP_VEC3) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockRender.kt index fee2b35c1..53534a3d6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/BlockRender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/PickedBlockRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/PickedBlockRender.kt index 3d44940c2..6903f21e8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/PickedBlockRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/PickedBlockRender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/WeightedBlockRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/WeightedBlockRender.kt index 5252d5c56..586bac41a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/WeightedBlockRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/WeightedBlockRender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.array.ArrayUtil.cast import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.container.stack.ItemStack diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/FullBlockPropertyRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/FullBlockPropertyRenderer.kt index a2ff6ea5e..575ecfff2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/FullBlockPropertyRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/FullBlockPropertyRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render.property -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side.FaceProperties import de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side.SideProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/PropertyOnlyBlockRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/PropertyOnlyBlockRender.kt index 41739265d..6e458ae6f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/PropertyOnlyBlockRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/render/property/PropertyOnlyBlockRender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.render.property -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt index 587151142..93cc49926 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.fluid.fluids -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt index 4b4173f8d..c66b0081f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.fluid.fluids -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/FlatItemRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/FlatItemRender.kt index 21d3ba89d..53f736c8b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/FlatItemRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/FlatItemRender.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.item -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModelPrototype.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModelPrototype.kt index 6d407d273..a830cff1b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModelPrototype.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModelPrototype.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.item -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.text.formatting.color.RGBArray import de.bixilon.minosoft.gui.rendering.chunk.mesh.BlockVertexConsumer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemRender.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemRender.kt index 16a4cd81b..235f83e93 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemRender.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemRender.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.item -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.text.formatting.color.RGBArray import de.bixilon.minosoft.gui.rendering.chunk.mesh.BlockVertexConsumer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/raw/display/ModelDisplay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/raw/display/ModelDisplay.kt index d8c71f4de..414f8cf48 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/raw/display/ModelDisplay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/raw/display/ModelDisplay.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.models.raw.display -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.kutil.json.JsonObject import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement.Companion.BLOCK_SIZE import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.rotateRadAssign diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtil.kt index cc1cc490e..3ab6d63d6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/util/CuboidUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.models.util -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.gui.rendering.models.block.element.FaceVertexData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleBehavior.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleBehavior.kt index 1a2bd2409..c1d592918 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleBehavior.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleBehavior.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.config.profile.profiles.particle.ParticleProfile import de.bixilon.minosoft.gui.rendering.particle.types.norender.ExplosionEmitterParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.explosion.ExplosionParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt index 8622044e4..f2783ca9f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.Identified import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.Particle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt index 0dfcdc88c..7208f1ee0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.collections.primitive.floats.AbstractFloatList import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt index 70c7994eb..9e863c9b4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.array.ArrayUtil.cast import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleShader.kt index e8497bf21..206ccc8ee 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.light.LightmapBuffer import de.bixilon.minosoft.gui.rendering.shader.Shader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt index dfc129c4f..7a0ffca5b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.data.physics.PhysicsEntity import de.bixilon.minosoft.data.registries.blocks.shapes.collision.context.ParticleCollisionContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt index 72823cd15..03f55c7ea 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.norender -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt index db52ec448..8140d7bdb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.norender -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.Particle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/emitter/EntityEmitterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/emitter/EntityEmitterParticle.kt index 729cde7b2..5876d6a36 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/emitter/EntityEmitterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/emitter/EntityEmitterParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.norender.emitter -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.random.RandomUtil.nextFloat import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt index 4c95ac7cf..39cf4f993 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt index ec11ac468..ed8002b06 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.render.RenderParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt index b6e69e3bc..69e084528 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt index 5ac340d5b..553aa2384 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced.block -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt index 7177fe62e..a12abadd9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt index d05882646..d97c23d50 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.vec3.Vec3d import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt index 31651ea6c..6c692eebc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.kotlinglm.pow -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.pow +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt index b35467c3e..5532aeccb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.TextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt index 77373afce..a0cabedc9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.animated -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt index 4a7ec6c40..9c7a8f2f0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.animated -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.rgb diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt index 9c9fed974..9470dd597 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.campfire -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt index a348cd83e..26539e75f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.cloud -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt index 5ea9dc8d3..2cbf2074d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.cloud -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt index 2265b9e20..8ce91f191 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt index d092d66c4..760a517b2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt index 2340d43f6..31f836596 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt index 201b7b1ae..42246afa5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt index 9482eb701..6fc6f2dd0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.DustParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt index 9f730c700..c5a640b93 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.DustParticleData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt index ee553d4e3..a9a91ff0d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt index 4d85af1d4..9a32272a5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt index b0b6b4fd8..7b31e5c02 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt index fb38eb46d..7b50aba0b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt index de09726b5..c0d74b067 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt index cf174877e..698314353 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt index a2c678aba..cd6033a75 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.explosion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt index cc10690fa..a0371be3a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.explosion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt index 6dd0ee3af..f22ed89fc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt index d0446d8d5..922ca1809 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.lava -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt index bb71bc5f2..f77186e9e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt index 948fa9e69..b2c7c9731 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt index 507058c84..a52785383 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt index 3605a1549..297b36081 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt index 1314effd6..60c5621f0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt index 51172c48a..994346210 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt index de4fec82e..b990e050e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt index b6a7219ca..da7bb9dff 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt index ccacda39d..b93f41d94 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt index bd790cfa5..af0bfaca0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt index e93f9af8f..ef15ecddb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.ChatColors diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt index 9364c4376..d1b4bd401 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt index a161be9de..e8dd40cca 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/BubbleParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/BubbleParticle.kt index f27558e20..3c0c4dd20 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/BubbleParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/BubbleParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt index 7f7cd31ea..d3ba4f556 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt index 9d9a085fb..e1750ae56 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt index 34a095a98..37eeb24fb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt index b88def445..0cb5c3c09 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/ColorShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/ColorShader.kt index d3a57bd5b..bd46e7ed6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/ColorShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/ColorShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.shader.generic -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.ViewProjectionShader import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/GenericTextureShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/GenericTextureShader.kt index 01c33bd79..3e21ebc14 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/GenericTextureShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/generic/GenericTextureShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.shader.generic -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.AnimatedShader import de.bixilon.minosoft.gui.rendering.shader.types.TextureShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/CameraPositionShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/CameraPositionShader.kt index ed1f5058a..17209679a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/CameraPositionShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/CameraPositionShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.shader.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.shader.AbstractShader import de.bixilon.minosoft.gui.rendering.shader.uniform.ShaderUniform import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/ViewProjectionShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/ViewProjectionShader.kt index 74b31605d..ff1143ae4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/ViewProjectionShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/ViewProjectionShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.shader.types -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.gui.rendering.shader.AbstractShader import de.bixilon.minosoft.gui.rendering.shader.uniform.ShaderUniform import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/SkeletalManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/SkeletalManager.kt index e14693b69..0189b39c6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/SkeletalManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/SkeletalManager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.skeletal.instance.SkeletalInstance diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/BakedSkeletalTransform.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/BakedSkeletalTransform.kt index edf3b4679..f8bd5105c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/BakedSkeletalTransform.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/BakedSkeletalTransform.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance data class BakedSkeletalTransform( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/SkeletalBakeContext.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/SkeletalBakeContext.kt index c5463478d..45ca6b33c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/SkeletalBakeContext.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/SkeletalBakeContext.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement.Companion.BLOCK_SIZE import de.bixilon.minosoft.gui.rendering.skeletal.mesh.AbstractSkeletalMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/Vec3KeyframeInstance.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/Vec3KeyframeInstance.kt index b36253074..afb87db2c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/Vec3KeyframeInstance.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/animation/keyframe/instance/Vec3KeyframeInstance.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.AnimationLoops import de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.keyframes.KeyframeInterpolation import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.interpolateLinear diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/SkeletalInstance.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/SkeletalInstance.kt index 558156ab2..fe75afbb4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/SkeletalInstance.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/SkeletalInstance.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.instance -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/TransformInstance.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/TransformInstance.kt index 330bcb67c..f82eb13d5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/TransformInstance.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/TransformInstance.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.instance -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.reset import java.nio.FloatBuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/AbstractSkeletalMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/AbstractSkeletalMesh.kt index 7bb14b3e9..f95a9fce7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/AbstractSkeletalMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/AbstractSkeletalMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.models.block.element.FaceVertexData import de.bixilon.minosoft.gui.rendering.system.base.texture.shader.ShaderTexture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMesh.kt index 498a261d2..37567f027 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.models.block.element.FaceVertexData import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtil.kt index 1c109da10..e6321dd00 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 object SkeletalMeshUtil { private const val ADD = +1.001f diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt index 80efdab42..06bb47972 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalModel diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/RotateKeyframe.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/RotateKeyframe.kt index c0bb8d370..afa24d8d5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/RotateKeyframe.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/RotateKeyframe.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.keyframes.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance.Vec3KeyframeInstance import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance import de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.AnimationLoops diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/ScaleKeyframe.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/ScaleKeyframe.kt index e6922f484..92d7fd206 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/ScaleKeyframe.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/ScaleKeyframe.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.keyframes.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance.Vec3KeyframeInstance import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance import de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.AnimationLoops diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/TranslateKeyframe.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/TranslateKeyframe.kt index 44b69ff7c..8b8d29225 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/TranslateKeyframe.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/animators/keyframes/types/TranslateKeyframe.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.keyframes.types -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.baked.animation.keyframe.instance.Vec3KeyframeInstance import de.bixilon.minosoft.gui.rendering.skeletal.instance.TransformInstance import de.bixilon.minosoft.gui.rendering.skeletal.model.animations.animators.AnimationLoops diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalElement.kt index 1e757b6c4..eb5208773 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,8 +14,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.elements import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalTransform diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalFace.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalFace.kt index 1280a1e4f..7a9b70b55 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalFace.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalFace.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.elements -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement.Companion.BLOCK_SIZE diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalRotation.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalRotation.kt index 9b1a1eacb..232bd3a8b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalRotation.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/elements/SkeletalRotation.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.elements -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY data class SkeletalRotation( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/textures/SkeletalTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/textures/SkeletalTexture.kt index b6ed1f01e..ef8585b2b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/textures/SkeletalTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/textures/SkeletalTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.textures -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i data class SkeletalTexture( val resolution: Vec2i, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/transforms/SkeletalTransform.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/transforms/SkeletalTransform.kt index 6926e067c..7d7f31cb1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/transforms/SkeletalTransform.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/transforms/SkeletalTransform.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.model.transforms -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement.Companion.BLOCK_SIZE import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalTransform import java.util.concurrent.atomic.AtomicInteger diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/shader/BaseSkeletalShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/shader/BaseSkeletalShader.kt index e65708fbc..712d87be3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/shader/BaseSkeletalShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/shader/BaseSkeletalShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.skeletal.shader -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.FogShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt index 65f5d0041..467902231 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.observer.DataObserver.Companion.observed diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt index 989c82e45..24b0f1bb5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.box -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.time.TimeUtil.millis diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColorShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColorShader.kt index eb43ee61c..5970a8751 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColorShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColorShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.box -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureMesh.kt index 44c3efe9f..3ba011b5b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureMesh.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.box -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.PrimitiveTypes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureShader.kt index 35e6eac06..66e84c78a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxTextureShader.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.box -import de.bixilon.kotlinglm.mat4x4.Mat4 +import glm_.mat4x4.Mat4 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.TextureShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudArray.kt index 9b5a09ff5..043b44c65 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudArray.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i class CloudArray( val layer: CloudLayer, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudColor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudColor.kt index 090451b7c..5a31f7fdf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudColor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudColor.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.minosoft.data.world.time.DayPhases diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudLayer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudLayer.kt index e4f139bfa..72fef56d7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudLayer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudLayer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.hash.HashUtil.murmur64 import de.bixilon.kutil.random.RandomUtil.nextFloat diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudMesh.kt index 13aa29cab..6db4163df 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudMesh.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudRenderer.kt index 1afef5f62..d1bea10ab 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.primitive.FloatUtil.toFloat diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudShader.kt index f9d3c46a1..bd50833c7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/clouds/CloudShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.clouds -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.camera.fog.FogManager import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.FogShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt index af2be1f83..38ac76cd7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.planet -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.hash.HashUtil.murmur64 import de.bixilon.kutil.random.RandomUtil.nextFloat import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetMesh.kt index b9f6d005d..217d0a7c3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.planet -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.PrimitiveTypes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetRenderer.kt index 3f0051fe4..f9b134321 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,11 +13,11 @@ package de.bixilon.minosoft.gui.rendering.sky.planet -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.data.world.time.WorldTime diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetShader.kt index 0bb38f989..62f936a96 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/PlanetShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.planet -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.mat4x4.Mat4 +import glm_.vec4.Vec4 import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.shader.types.TextureShader import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterRenderer.kt index 2e3a6fc94..47e1f1e16 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterRenderer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,11 +13,11 @@ package de.bixilon.minosoft.gui.rendering.sky.planet.scatter -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 -import de.bixilon.kotlinglm.vec4.swizzle.xyz +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 +import glm_.vec4.swizzle.xyz import de.bixilon.kutil.math.MathConstants.PIf import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterShader.kt index d2c31606e..da99db5b3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/scatter/SunScatterShader.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sky.planet.scatter -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt index 78340b30e..880fc0224 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sound -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedList import de.bixilon.kutil.concurrent.queue.Queue diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundListener.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundListener.kt index 8eb102ed7..bdd096b3d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundListener.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundListener.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sound -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY import org.lwjgl.openal.AL10.* diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundSource.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundSource.kt index 5b89c94c9..a99e9c43c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundSource.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/SoundSource.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sound -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.kutil.time.TimeUtil.now import de.bixilon.minosoft.gui.rendering.sound.sounds.Sound diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt index 055542c97..9facbe4f1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.stats -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.avg._long.LongAverage import de.bixilon.kutil.random.RandomUtil.nextFloat import de.bixilon.kutil.random.RandomUtil.nextInt diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt index 562a0d75c..089cb4e93 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.collections.primitive.floats.AbstractFloatList import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/Framebuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/Framebuffer.kt index b32ad6bb8..209377481 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/Framebuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/Framebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.buffer.frame -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture.FramebufferTexture import de.bixilon.minosoft.gui.rendering.system.base.buffer.render.Renderbuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/texture/FramebufferTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/texture/FramebufferTexture.kt index 5041acbb7..b6a5427c1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/texture/FramebufferTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/frame/texture/FramebufferTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i interface FramebufferTexture { val size: Vec2i diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/render/Renderbuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/render/Renderbuffer.kt index 73af18701..4d5175a83 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/render/Renderbuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/buffer/render/Renderbuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.buffer.render -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i interface Renderbuffer { val mode: RenderbufferModes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt index 05c9ceb86..4445807cf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt @@ -13,11 +13,11 @@ package de.bixilon.minosoft.gui.rendering.system.base.shader -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec4.Vec4 import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt index 8da0b9133..eb2791488 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.gui.atlas.textures.CodeTexturePart diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TexturePart.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TexturePart.kt index 88404c284..01e91bf2a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TexturePart.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TexturePart.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture interface TexturePart { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/StaticTextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/StaticTextureArray.kt index 2e45e3948..150fc1b2d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/StaticTextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/StaticTextureArray.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.array -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.concurrent.lock.RWLock import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.pool.ThreadPool diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/TextureArrayProperties.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/TextureArrayProperties.kt index 933fe6aed..8ec2593f5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/TextureArrayProperties.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/TextureArrayProperties.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.array -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 data class TextureArrayProperties( val uvEnd: Vec2?, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/TextureData.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/TextureData.kt index 6538ce6f3..0d2f23c51 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/TextureData.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/TextureData.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer.TextureBuffer import org.objenesis.ObjenesisStd diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8Buffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8Buffer.kt index fcba232c4..573439f79 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8Buffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGB8Buffer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8Buffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8Buffer.kt index 7e6522b02..a95d91a4d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8Buffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/RGBA8Buffer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor import org.lwjgl.BufferUtils diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBuffer.kt index 212dbb22a..4be1a0a45 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBuffer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBAColor.Companion.rgba import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBufferFactory.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBufferFactory.kt index dce0359cb..22ad4bcee 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBufferFactory.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/data/buffer/TextureBufferFactory.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.data.buffer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i fun interface TextureBufferFactory { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/dynamic/DynamicTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/dynamic/DynamicTexture.kt index 1b71bcfa9..496163075 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/dynamic/DynamicTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/dynamic/DynamicTexture.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.dynamic -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.concurrent.lock.RWLock import de.bixilon.kutil.exception.ExceptionUtil.ignoreAll import de.bixilon.minosoft.gui.rendering.system.base.texture.data.MipmapTextureData diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/shader/ShaderTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/shader/ShaderTexture.kt index d024d6dc7..3e9761f53 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/shader/ShaderTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/shader/ShaderTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.shader -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 interface ShaderTexture : ShaderIdentifiable { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt index 70541c8a8..602455e8c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.skin -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.exception.ExceptionUtil.catchAll import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.config.profile.profiles.account.AccountProfileManager diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/vanilla/DefaultSkinProvider.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/vanilla/DefaultSkinProvider.kt index 3bdedb0cf..8422b397e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/vanilla/DefaultSkinProvider.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/vanilla/DefaultSkinProvider.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,6 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.skin.vanilla -import de.bixilon.kotlinglm.GLM.abs import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.properties.textures.metadata.SkinModel @@ -24,6 +23,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.skin.PlayerSkin import de.bixilon.minosoft.gui.rendering.textures.TextureUtil.readTexture import de.bixilon.minosoft.gui.rendering.textures.TextureUtil.texture import java.util.* +import kotlin.math.abs class DefaultSkinProvider( private val array: DynamicTextureArray, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/sprite/SpriteAnimator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/sprite/SpriteAnimator.kt index ab8d96f9c..527ae0d5e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/sprite/SpriteAnimator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/sprite/SpriteAnimator.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.sprite -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.array.ArrayUtil.cast import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.time.TimeUtil.now diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/Texture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/Texture.kt index be7d0786e..875913b50 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/Texture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/Texture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.texture -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureStates import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/TextureRenderData.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/TextureRenderData.kt index 72bbc2a32..2c27c306c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/TextureRenderData.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/TextureRenderData.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.texture -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 interface TextureRenderData { val shaderTextureId: Int diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/FileTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/FileTexture.kt index d8b6b3054..c2a703079 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/FileTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/FileTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.texture.file -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.assets.util.InputStreamUtil.readJson import de.bixilon.minosoft.data.registries.identified.ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/memory/MemoryTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/memory/MemoryTexture.kt index 67f7ae3d0..352aa79f9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/memory/MemoryTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/memory/MemoryTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.base.texture.texture.memory -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureStates import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt index 601f08ca1..8dab07efc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.system.opengl -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec4.Vec4 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.exception.ExceptionUtil.catchAll import de.bixilon.kutil.stream.InputStreamUtil.readAsString diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt index e4d7ebe03..4059ae014 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.formatting.color.Colors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/OpenGLFramebuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/OpenGLFramebuffer.kt index 5f707d21b..bc983b026 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/OpenGLFramebuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/OpenGLFramebuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.buffer.frame -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.Framebuffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.FramebufferState import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture.FramebufferTexture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferColorTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferColorTexture.kt index fa069baf6..50c6a1b7e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferColorTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferColorTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.buffer.frame.texture -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture.FramebufferTexture import org.lwjgl.opengl.GL30.* import java.nio.ByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferDepthTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferDepthTexture.kt index a76ad86a9..d8c472bfa 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferDepthTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/frame/texture/OpenGLFramebufferDepthTexture.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.buffer.frame.texture -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.frame.texture.FramebufferTexture import de.bixilon.minosoft.gui.rendering.system.base.buffer.render.RenderbufferModes import de.bixilon.minosoft.gui.rendering.system.opengl.buffer.render.OpenGLRenderbuffer.Companion.gl diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/render/OpenGLRenderbuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/render/OpenGLRenderbuffer.kt index b59ce7db9..7fdadf71a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/render/OpenGLRenderbuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/render/OpenGLRenderbuffer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.buffer.render -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.gui.rendering.system.base.buffer.render.Renderbuffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.render.RenderbufferModes import de.bixilon.minosoft.gui.rendering.system.base.buffer.render.RenderbufferStates diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt index 93b753269..984f93e2c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.texture -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt index dc0d73e29..d9f101d48 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.texture -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.minosoft.gui.rendering.RenderContext diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureData.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureData.kt index 955408c32..5b24e0e13 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureData.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureData.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.texture -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.TextureRenderData class OpenGLTextureData( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt index 73dd15d89..379a4aa55 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.system.window -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.terminal.RunConfiguration diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt index 25562608c..a1c88127f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.system.window.glfw -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2 +import glm_.vec2.Vec2d +import glm_.vec2.Vec2i import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.latch.SimpleLatch import de.bixilon.kutil.observer.DataObserver.Companion.observed diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureUtil.kt index 48bd2c383..90bb68d20 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.textures -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.file.FileUtil.mkdirParent import de.bixilon.minosoft.data.registries.identified.ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationProperties.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationProperties.kt index 84d3b626b..96ee4033c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationProperties.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/properties/AnimationProperties.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.textures.properties import com.fasterxml.jackson.annotation.JsonProperty -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.protocol.network.session.play.tick.Ticks.Companion.ticks import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/FoliageTintCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/FoliageTintCalculator.kt index f5bfd773f..46da8866c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/FoliageTintCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/FoliageTintCalculator.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.tint.tints.plants -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.registries.blocks.state.BlockState diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/redstone/RedstoneWireTintCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/redstone/RedstoneWireTintCalculator.kt index 61d738dfd..a1d822533 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/redstone/RedstoneWireTintCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/redstone/RedstoneWireTintCalculator.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.tint.tints.redstone -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt index f31a9a73a..b765710da 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.pool.ThreadPool import de.bixilon.kutil.concurrent.pool.io.DefaultIOPool diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt index ae16fec27..89de7705f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt @@ -13,12 +13,12 @@ package de.bixilon.minosoft.gui.rendering.util -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i -import de.bixilon.kotlinglm.vec3.Vec3t +import glm_.func.common.clamp +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i +import glm_.vec3.Vec3t import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.types.properties.offset.RandomOffsetTypes import de.bixilon.minosoft.data.world.positions.BlockPosition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4Util.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4Util.kt index b44b56a8f..8d07d9a86 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4Util.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4Util.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.util.mat.mat4 -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.glm +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 object Mat4Util { private val empty = Mat4() @@ -61,8 +61,8 @@ object Mat4Util { } fun rotateX(m: Mat4, angle: Float) { - val c = GLM.cos(angle) - val s = GLM.sin(angle) + val c = glm.cos(angle) + val s = glm.sin(angle) val tempX = (1f - c) @@ -91,8 +91,8 @@ object Mat4Util { } fun rotateY(m: Mat4, angle: Float) { - val c = GLM.cos(angle) - val s = GLM.sin(angle) + val c = glm.cos(angle) + val s = glm.sin(angle) val tempY = (1f - c) @@ -122,8 +122,8 @@ object Mat4Util { } fun rotateZ(m: Mat4, angle: Float) { - val c = GLM.cos(angle) - val s = GLM.sin(angle) + val c = glm.cos(angle) + val s = glm.sin(angle) val tempZ = (1f - c) val rotate10 = -s diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt index dd5193a61..bc38e8769 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt index fbe3bf880..c3a6d52c1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.exception.Broken import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.shapes.aabb.AABB diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt index f4fb816c3..8a3bba6f9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.collections.primitive.floats.AbstractFloatList diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt index c77d26408..dbcf4e455 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt @@ -13,13 +13,13 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.mat4x4.Mat4 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2d +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.util.mesh.uv.PackedUV import de.bixilon.minosoft.gui.rendering.util.mesh.uv.UnpackedUV diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/PositionOnlyMeshStruct.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/PositionOnlyMeshStruct.kt index a2d53b1d3..ac8dcce45 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/PositionOnlyMeshStruct.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/PositionOnlyMeshStruct.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 data class PositionOnlyMeshStruct( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt index 433aa3856..4b5865e30 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.util.mesh -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.text.formatting.color.Colors import de.bixilon.minosoft.data.text.formatting.color.RGBAColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/uv/PackedUV.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/uv/PackedUV.kt index 2f51d7ba6..1380f9143 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/uv/PackedUV.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/uv/PackedUV.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util.mesh.uv -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.math.simple.FloatMath.clamp import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2Util.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2Util.kt index 6b4760fb3..dd25d6071 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2Util.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2Util.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec2 -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateSine import de.bixilon.kutil.primitive.FloatUtil.toFloat diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2dUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2dUtil.kt index e1f14c1ef..7385369bf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2dUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2dUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec2 -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.kutil.primitive.DoubleUtil.toDouble object Vec2dUtil { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2iUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2iUtil.kt index 989d302ab..5593c57c7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2iUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec2/Vec2iUtil.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec2 -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.func.rad +import glm_.vec2.Vec2 +import glm_.vec2.Vec2i import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt index 489455d91..f1ce510f2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt @@ -13,16 +13,16 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec3 -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.func.cos -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.func.sin -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i -import de.bixilon.kotlinglm.vec3.swizzle.xy -import de.bixilon.kotlinglm.vec3.swizzle.xz -import de.bixilon.kotlinglm.vec3.swizzle.yz +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.func.cos +import glm_.func.rad +import glm_.func.sin +import glm_.vec2.Vec2 +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i +import glm_.vec3.swizzle.xy +import glm_.vec3.swizzle.xz +import glm_.vec3.swizzle.yz import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.kutil.math.simple.FloatMath.floor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3dUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3dUtil.kt index 2af9b3581..8835fd10e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3dUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3dUtil.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec3 -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.func.common.clamp +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.kutil.math.interpolation.DoubleInterpolation.interpolateLinear import de.bixilon.kutil.math.interpolation.DoubleInterpolation.interpolateSine import de.bixilon.kutil.math.simple.DoubleMath.ceil diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3iUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3iUtil.kt index 0a7f2f2e7..5d04d40be 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3iUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3iUtil.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec3 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec2.Vec2i +import glm_.vec3.Vec3 +import glm_.vec3.Vec3i import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.DirectionVector diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4Util.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4Util.kt index 2e3cc02c3..a98b01a4b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4Util.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4Util.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec4 -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec4.Vec4 object Vec4Util { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4iUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4iUtil.kt index 169b25803..d865ea4ed 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4iUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec4/Vec4iUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.util.vec.vec4 -import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kotlinglm.vec4.Vec4i +import glm_.vec2.Vec2i +import glm_.vec4.Vec4i object Vec4iUtil { diff --git a/src/main/java/de/bixilon/minosoft/input/interaction/breaking/survival/SurvivalDigger.kt b/src/main/java/de/bixilon/minosoft/input/interaction/breaking/survival/SurvivalDigger.kt index 2ce363bd9..723148494 100644 --- a/src/main/java/de/bixilon/minosoft/input/interaction/breaking/survival/SurvivalDigger.kt +++ b/src/main/java/de/bixilon/minosoft/input/interaction/breaking/survival/SurvivalDigger.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.input.interaction.breaking.survival -import de.bixilon.kotlinglm.pow +import glm_.pow import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.data.entities.entities.player.Hands import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock diff --git a/src/main/java/de/bixilon/minosoft/input/interaction/use/ShortUseHandler.kt b/src/main/java/de/bixilon/minosoft/input/interaction/use/ShortUseHandler.kt index 98cc920c9..47aedd8b6 100644 --- a/src/main/java/de/bixilon/minosoft/input/interaction/use/ShortUseHandler.kt +++ b/src/main/java/de/bixilon/minosoft/input/interaction/use/ShortUseHandler.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.input.interaction.use -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.camera.target.targets.EntityTarget import de.bixilon.minosoft.camera.target.targets.GenericTarget diff --git a/src/main/java/de/bixilon/minosoft/local/LocalConnection.kt b/src/main/java/de/bixilon/minosoft/local/LocalConnection.kt index b5339821a..d192c75dd 100644 --- a/src/main/java/de/bixilon/minosoft/local/LocalConnection.kt +++ b/src/main/java/de/bixilon/minosoft/local/LocalConnection.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.local -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.chat.message.SimpleChatMessage diff --git a/src/main/java/de/bixilon/minosoft/local/storage/DebugStorage.kt b/src/main/java/de/bixilon/minosoft/local/storage/DebugStorage.kt index 92a29bb95..f95db408b 100644 --- a/src/main/java/de/bixilon/minosoft/local/storage/DebugStorage.kt +++ b/src/main/java/de/bixilon/minosoft/local/storage/DebugStorage.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.local.storage -import de.bixilon.kotlinglm.vec2.Vec2d +import glm_.vec2.Vec2d import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.border.area.StaticBorderArea import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/ExplosionEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/ExplosionEvent.kt index f7eb03214..b75c4dfc8 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/ExplosionEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/ExplosionEvent.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.modding.event.events.session.play.PlaySessionEvent import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt index d8d28e704..53d46a17b 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.modding.event.events -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.SoundCategories import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.modding.event.events.session.play.PlaySessionEvent diff --git a/src/main/java/de/bixilon/minosoft/physics/VanillaMath.kt b/src/main/java/de/bixilon/minosoft/physics/VanillaMath.kt index db769ffde..5bab24568 100644 --- a/src/main/java/de/bixilon/minosoft/physics/VanillaMath.kt +++ b/src/main/java/de/bixilon/minosoft/physics/VanillaMath.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d object VanillaMath { diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/BasicPhysicsEntity.kt b/src/main/java/de/bixilon/minosoft/physics/entities/BasicPhysicsEntity.kt index ebfa1c5be..aeb345ba4 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/BasicPhysicsEntity.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/BasicPhysicsEntity.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY abstract class BasicPhysicsEntity { diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt index c2cc38a82..37e0f7bdd 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.simple.IntMath.clamp import de.bixilon.kutil.primitive.DoubleUtil import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/item/FallingBlockPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/item/FallingBlockPhysics.kt index cf45c474e..e9cb7309c 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/item/FallingBlockPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/item/FallingBlockPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.item.FallingBlockEntity import de.bixilon.minosoft.physics.PhysicsConstants import de.bixilon.minosoft.physics.entities.EntityPhysics diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/item/ItemEntityPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/item/ItemEntityPhysics.kt index 4803c265d..02e1d14f8 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/item/ItemEntityPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/item/ItemEntityPhysics.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.entities.entities.item.ItemEntity import de.bixilon.minosoft.data.registries.blocks.types.properties.physics.FrictionBlock diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/item/PrimedTNTPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/item/PrimedTNTPhysics.kt index 72b09a28f..36ad36d9f 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/item/PrimedTNTPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/item/PrimedTNTPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities.item -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.item.PrimedTNT import de.bixilon.minosoft.physics.PhysicsConstants import de.bixilon.minosoft.physics.entities.EntityPhysics diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt index f5149c0e3..da833c995 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities.living -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.entities.Poses import de.bixilon.minosoft.data.entities.entities.LivingEntity diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/living/animal/PigPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/living/animal/PigPhysics.kt index 3f739bf0f..4dc33aa8d 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/living/animal/PigPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/living/animal/PigPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.entities.living.animal -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.entities.animal.Pig import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.registries.effects.attributes.MinecraftAttributes diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/living/player/PlayerPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/living/player/PlayerPhysics.kt index c60791340..79a43e5e7 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/living/player/PlayerPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/living/player/PlayerPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.entities.living.player -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.Poses import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/living/player/local/LocalPlayerPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/living/player/local/LocalPlayerPhysics.kt index cb91c77c0..fe7db6beb 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/living/player/local/LocalPlayerPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/living/player/local/LocalPlayerPhysics.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.entities.living.player.local -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.Poses diff --git a/src/main/java/de/bixilon/minosoft/physics/handlers/movement/SneakAdjuster.kt b/src/main/java/de/bixilon/minosoft/physics/handlers/movement/SneakAdjuster.kt index 679d0113d..192b7f2bd 100644 --- a/src/main/java/de/bixilon/minosoft/physics/handlers/movement/SneakAdjuster.kt +++ b/src/main/java/de/bixilon/minosoft/physics/handlers/movement/SneakAdjuster.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.handlers.movement -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.shapes.aabb.AABB diff --git a/src/main/java/de/bixilon/minosoft/physics/input/MovementInput.kt b/src/main/java/de/bixilon/minosoft/physics/input/MovementInput.kt index 2e9660b1a..16e6d8a9e 100644 --- a/src/main/java/de/bixilon/minosoft/physics/input/MovementInput.kt +++ b/src/main/java/de/bixilon/minosoft/physics/input/MovementInput.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.input -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.rad +import glm_.vec3.Vec3d import de.bixilon.kutil.math.Trigonometry import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY import de.bixilon.minosoft.physics.PhysicsConstants diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt index adf0a43cc..09e470e7a 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.parts -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.swizzle.xz +import glm_.vec3.Vec3d +import glm_.vec3.swizzle.xz import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.registries.blocks.shapes.collision.CollisionPredicate import de.bixilon.minosoft.data.registries.blocks.shapes.collision.context.EntityCollisionContext diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/JumpPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/JumpPhysics.kt index ce3a9a9e4..75e61ca3f 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/JumpPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/JumpPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.parts -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.rad +import glm_.vec3.Vec3d import de.bixilon.kutil.math.Trigonometry import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/OutOfBlockPusher.kt b/src/main/java/de/bixilon/minosoft/physics/parts/OutOfBlockPusher.kt index f1af1e05a..58c0c8ee7 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/OutOfBlockPusher.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/OutOfBlockPusher.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.parts -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec2.Vec2d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.simple.DoubleMath.floor import de.bixilon.kutil.math.simple.IntMath.clamp import de.bixilon.minosoft.data.Axes diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/climbing/ClimbingPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/climbing/ClimbingPhysics.kt index 2033d61e4..83a2de823 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/climbing/ClimbingPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/climbing/ClimbingPhysics.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.parts.climbing -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.math.simple.DoubleMath.clamp import de.bixilon.minosoft.data.registries.blocks.handler.entity.Climbable import de.bixilon.minosoft.data.registries.blocks.types.climbing.ScaffoldingBlock diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/elytra/ElytraPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/elytra/ElytraPhysics.kt index 685120739..aa9b5347a 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/elytra/ElytraPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/elytra/ElytraPhysics.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.physics.parts.elytra -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.swizzle.xz +import glm_.func.rad +import glm_.vec3.Vec3d +import glm_.vec3.swizzle.xz import de.bixilon.kutil.math.Trigonometry import de.bixilon.minosoft.data.container.equipment.EquipmentSlots import de.bixilon.minosoft.data.entities.EntityRotation diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/input/InputPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/input/InputPhysics.kt index 3e7a84b7e..a1d1fd079 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/input/InputPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/input/InputPhysics.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.parts.input -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.registries.blocks.types.properties.physics.FrictionBlock import de.bixilon.minosoft.data.registries.effects.movement.MovementEffect diff --git a/src/main/java/de/bixilon/minosoft/physics/submersion/FluidUpdate.kt b/src/main/java/de/bixilon/minosoft/physics/submersion/FluidUpdate.kt index ff0dd2be7..844f53236 100644 --- a/src/main/java/de/bixilon/minosoft/physics/submersion/FluidUpdate.kt +++ b/src/main/java/de/bixilon/minosoft/physics/submersion/FluidUpdate.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.physics.submersion -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d data class FluidUpdate( val height: Double, diff --git a/src/main/java/de/bixilon/minosoft/physics/submersion/SubmersionState.kt b/src/main/java/de/bixilon/minosoft/physics/submersion/SubmersionState.kt index d5b19609a..da34be7a7 100644 --- a/src/main/java/de/bixilon/minosoft/physics/submersion/SubmersionState.kt +++ b/src/main/java/de/bixilon/minosoft/physics/submersion/SubmersionState.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.physics.submersion -import de.bixilon.kotlinglm.func.common.clamp -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.func.common.clamp +import glm_.vec3.Vec3d import de.bixilon.kutil.math.simple.DoubleMath.floor import de.bixilon.minosoft.data.Tickable import de.bixilon.minosoft.data.direction.Directions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt index 9bee6d4dc..d2d64a3bf 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play.block -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.entities.entities.player.Hands diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt index ca5691569..c7dd6265e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.c2s.play.entity.interact -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.player.Hands import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionC2SP.kt index b00902bbd..5af153ca5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionC2SP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.protocol.packets.c2s.PlayC2SPacket import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayOutByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionRotationC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionRotationC2SP.kt index 214a92348..0baa6f796 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionRotationC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/PositionRotationC2SP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.protocol.packets.c2s.PlayC2SPacket import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/vehicle/MoveVehicleC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/vehicle/MoveVehicleC2SP.kt index 5901975f6..08e7cd38f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/vehicle/MoveVehicleC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/move/vehicle/MoveVehicleC2SP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play.entity.move.vehicle -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.protocol.packets.c2s.PlayC2SPacket import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayOutByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MoveVehicleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MoveVehicleS2CP.kt index 7ccdffff6..72ecf0d2b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MoveVehicleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MoveVehicleS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.packets.c2s.play.entity.move.vehicle.MoveVehicleC2SP diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt index c1ca82f40..9acb96128 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PlayerFaceS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PlayerFaceS2CP.kt index 6e8c21f5e..d072bb35b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PlayerFaceS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PlayerFaceS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt index 2b9db3d6f..bfb4f3d61 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.bit.BitByte.isBitMask import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt index d010925dd..ead59e91d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt index 193a63483..7b2a34a1c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt index d0c2ad3fb..c0137a534 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.move -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/player/HealthS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/player/HealthS2CP.kt index ebd9dcecf..922ef4730 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/player/HealthS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/player/HealthS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.player -import de.bixilon.kotlinglm.func.common.clamp +import glm_.func.common.clamp import de.bixilon.minosoft.data.entities.entities.player.local.HealthCondition import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.network.session.play.PlaySessionStates diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt index 9ca531d2b..d9c3e9b84 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt index 021f47349..3c5a1294f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPlayerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPlayerS2CP.kt index 2f9c0326f..fd3b80436 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPlayerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPlayerS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.RemotePlayerEntity diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt index 58a116cee..b0e0de6f2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.LightningBolt import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt index 0c0e34b86..1ffbd5ea7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play.map -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.world.map.MapPin import de.bixilon.minosoft.data.world.map.MapPinTypes import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt index 1c999451a..018880940 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play.map.legacy -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt index dbf640d91..f7ac4f0f2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play.map.legacy -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i import de.bixilon.minosoft.data.world.map.MapPin import de.bixilon.minosoft.data.world.map.MapPinTypes import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt index 759998b97..54da95f24 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.sound -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.SoundCategories import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.modding.event.events.PlaySoundEvent diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt index 75038cac7..278935a34 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.sound -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.SoundCategories import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.modding.event.events.PlaySoundEvent diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ExplosionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ExplosionS2CP.kt index 8f178e511..7eb3b6203 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ExplosionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ExplosionS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.world -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.kutil.enums.ValuesEnum.Companion.names import de.bixilon.minosoft.data.world.World diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ParticleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ParticleS2CP.kt index 619676d97..bb9a7e5c9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ParticleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ParticleS2CP.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play.world -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.util.VecUtil.times import de.bixilon.minosoft.protocol.network.session.play.PlaySession diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/InByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/InByteBuffer.kt index 782d32d72..dcad6b6c2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/InByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/InByteBuffer.kt @@ -12,11 +12,11 @@ */ package de.bixilon.minosoft.protocol.protocol.buffers -import de.bixilon.kotlinglm.vec2.Vec2 -import de.bixilon.kotlinglm.vec2.Vec2d -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec2.Vec2 +import glm_.vec2.Vec2d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d +import glm_.vec4.Vec4 import de.bixilon.kutil.compression.zlib.GzipUtil.decompress import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.config.DebugOptions diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/OutByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/OutByteBuffer.kt index e11cf8903..b4b1b1510 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/OutByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/OutByteBuffer.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.protocol.protocol.buffers -import de.bixilon.kotlinglm.vec3.Vec3 -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3 +import glm_.vec3.Vec3d import de.bixilon.minosoft.data.registries.identified.Namespaces import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt index 202c2c455..b9c18f49c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.protocol.buffers.play -import de.bixilon.kotlinglm.vec3.Vec3d +import glm_.vec3.Vec3d import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.kutil.json.JsonUtil.asJsonObject import de.bixilon.kutil.json.JsonUtil.toMutableJsonObject diff --git a/src/main/java/de/bixilon/minosoft/terminal/commands/session/BenchmarkCommand.kt b/src/main/java/de/bixilon/minosoft/terminal/commands/session/BenchmarkCommand.kt index 31a120341..babf5d6fa 100644 --- a/src/main/java/de/bixilon/minosoft/terminal/commands/session/BenchmarkCommand.kt +++ b/src/main/java/de/bixilon/minosoft/terminal/commands/session/BenchmarkCommand.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.terminal.commands.session -import de.bixilon.kotlinglm.GLM.PIf -import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kutil.math.MathConstants.PIf +import glm_.vec3.Vec3d import de.bixilon.kutil.math.Trigonometry.sin import de.bixilon.kutil.random.RandomUtil.nextDouble import de.bixilon.kutil.random.RandomUtil.nextFloat diff --git a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt index 702a8de09..201f8cd68 100644 --- a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt +++ b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -29,6 +29,8 @@ import de.bixilon.minosoft.config.profile.profiles.other.OtherProfileManager import de.bixilon.minosoft.properties.MinosoftProperties import de.bixilon.minosoft.terminal.CommandLineArguments import de.bixilon.minosoft.terminal.RunConfiguration +import de.bixilon.minosoft.util.KUtil.div +import de.bixilon.minosoft.util.KUtil.toPath import de.bixilon.minosoft.util.http.HTTP2.get import de.bixilon.minosoft.util.http.HTTPResponse import de.bixilon.minosoft.util.http.exceptions.HTTPException @@ -41,6 +43,7 @@ import java.io.FileOutputStream import java.net.URL import java.security.MessageDigest import java.security.SignatureException +import kotlin.io.path.absolutePathString object MinosoftUpdater { var update: MinosoftUpdate? by observed(null) @@ -159,7 +162,7 @@ object MinosoftUpdater { fun start(jar: File) { val arguments: MutableList = mutableListOf() - arguments += System.getProperty("java.home") + File.separator + "bin" + File.separator + "java" + arguments += (System.getProperty("java.home").toPath() / "bin" / "java").absolutePathString() arguments += "-jar" arguments += jar.absolutePath.toString() arguments += CommandLineArguments.ARGUMENTS diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt index d2e14b0b1..230fdbf74 100644 --- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt @@ -18,11 +18,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode import de.bixilon.jiibles.AnyString import de.bixilon.jiibles.Table import de.bixilon.jiibles.TableStyles -import de.bixilon.kotlinglm.GLM -import de.bixilon.kotlinglm.vec2.Vec2t -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3t -import de.bixilon.kotlinglm.vec4.Vec4t +import glm_.vec2.Vec2t +import glm_.vec3.Vec3d +import glm_.vec3.Vec3t +import glm_.vec4.Vec4t import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf @@ -67,6 +66,7 @@ import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.util.account.microsoft.MicrosoftOAuthUtils import de.bixilon.minosoft.util.json.Jackson import de.bixilon.minosoft.util.url.ResourceURLHandler +import glm_.glm import io.netty.channel.SimpleChannelInboundHandler import javafx.application.Platform import org.kamranzafar.jtar.TarHeader @@ -270,7 +270,7 @@ object KUtil { fun initPlayClasses() { DefaultThreadPool += { PlaySession::class.java.forceInit() } - DefaultThreadPool += { GLM::class.java.forceInit() } // whole glm + DefaultThreadPool += { glm::class.java.forceInit() } // whole glm DefaultThreadPool += { ItemFactories::class.java.forceInit() } DefaultThreadPool += { BlockFactories::class.java.forceInit() } DefaultThreadPool += { RecipeFactories::class.java.forceInit() } diff --git a/src/main/java/de/bixilon/minosoft/util/json/SkeletalRotationDeserializer.kt b/src/main/java/de/bixilon/minosoft/util/json/SkeletalRotationDeserializer.kt index 5cf89f1a8..de56d7088 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/SkeletalRotationDeserializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/SkeletalRotationDeserializer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -17,7 +17,7 @@ import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonToken import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.deser.std.StdDeserializer -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.skeletal.model.elements.SkeletalRotation object SkeletalRotationDeserializer : StdDeserializer(SkeletalRotation::class.java) { diff --git a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2Serializer.kt b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2Serializer.kt index 361ee7691..c243c9498 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2Serializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2Serializer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.ser.std.StdSerializer -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 object Vec2Serializer : SimpleModule() { diff --git a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2iSerializer.kt b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2iSerializer.kt index f6e67dd45..4eba441de 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2iSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec2iSerializer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.ser.std.StdSerializer -import de.bixilon.kotlinglm.vec2.Vec2i +import glm_.vec2.Vec2i object Vec2iSerializer : SimpleModule() { diff --git a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec3Serializer.kt b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec3Serializer.kt index e3ce93ce3..37e56f216 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec3Serializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec3Serializer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.ser.std.StdSerializer -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 object Vec3Serializer : SimpleModule() { diff --git a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec4Serializer.kt b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec4Serializer.kt index 1f6c3c805..fccb2d1cd 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/vec/Vec4Serializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/vec/Vec4Serializer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.ser.std.StdSerializer -import de.bixilon.kotlinglm.vec4.Vec4 +import glm_.vec4.Vec4 object Vec4Serializer : SimpleModule() { diff --git a/src/test/java/de/bixilon/minosoft/data/direction/DirectionsTest.kt b/src/test/java/de/bixilon/minosoft/data/direction/DirectionsTest.kt index 771fd9a62..6ace960ed 100644 --- a/src/test/java/de/bixilon/minosoft/data/direction/DirectionsTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/direction/DirectionsTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.direction -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3i import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/java/de/bixilon/minosoft/data/entities/EntityRotationTest.kt b/src/test/java/de/bixilon/minosoft/data/entities/EntityRotationTest.kt index 5412b1439..76bc02dcb 100644 --- a/src/test/java/de/bixilon/minosoft/data/entities/EntityRotationTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/entities/EntityRotationTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.entities.EntityRotation.Companion.interpolateYaw import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/java/de/bixilon/minosoft/data/registries/CombinedShapeLineDrawingTest.kt b/src/test/java/de/bixilon/minosoft/data/registries/CombinedShapeLineDrawingTest.kt index 52b3364c2..1167f56cf 100644 --- a/src/test/java/de/bixilon/minosoft/data/registries/CombinedShapeLineDrawingTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/registries/CombinedShapeLineDrawingTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.shapes.aabb.AABB import de.bixilon.minosoft.data.registries.shapes.shape.CombinedShape import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY diff --git a/src/test/java/de/bixilon/minosoft/data/registries/shapes/AABBTest.kt b/src/test/java/de/bixilon/minosoft/data/registries/shapes/AABBTest.kt index e1d461823..fee807d4a 100644 --- a/src/test/java/de/bixilon/minosoft/data/registries/shapes/AABBTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/registries/shapes/AABBTest.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.registries.shapes -import de.bixilon.kotlinglm.vec3.Vec3d -import de.bixilon.kotlinglm.vec3.Vec3i +import glm_.vec3.Vec3d +import glm_.vec3.Vec3i import de.bixilon.kutil.primitive.DoubleUtil.matches import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.direction.Directions diff --git a/src/test/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShapeTest.kt b/src/test/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShapeTest.kt index 71c4b60e5..a449e8757 100644 --- a/src/test/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShapeTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/registries/shapes/shape/CombinedShapeTest.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.registries.shapes.shape -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.registries.shapes.aabb.AABB import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotEquals diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshTest.kt index 9f21c5735..00b9c733e 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh -import de.bixilon.kotlinglm.vec2.Vec2 +import glm_.vec2.Vec2 import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt index 70b8130d3..62e98152a 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.pushRight import de.bixilon.minosoft.gui.rendering.models.util.CuboidUtil diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/SkeletalShadeTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/SkeletalShadeTest.kt index d5af9f756..47f497a3f 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/SkeletalShadeTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/SkeletalShadeTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat3x3.Mat3 -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.mat3x3.Mat3 +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import org.junit.jupiter.api.Test import kotlin.math.abs import kotlin.math.asin diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtilTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtilTest.kt index 70b28dc2c..2b4bd5880 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtilTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/skeletal/mesh/SkeletalMeshUtilTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.skeletal.mesh -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.vec3.Vec3 import de.bixilon.kutil.primitive.IntUtil.toHex import org.junit.jupiter.api.Test diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4UtilTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4UtilTest.kt index 6bb986dd4..c1cdaa5a1 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4UtilTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/util/mat/mat4/Mat4UtilTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.util.mat.mat4 -import de.bixilon.kotlinglm.func.rad -import de.bixilon.kotlinglm.mat4x4.Mat4 -import de.bixilon.kotlinglm.vec3.Vec3 +import glm_.func.rad +import glm_.mat4x4.Mat4 +import glm_.vec3.Vec3 import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.translateXAssign import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.translateYAssign import de.bixilon.minosoft.gui.rendering.util.mat.mat4.Mat4Util.translateZAssign