From 6911bbe238de0dde753c29d5a20c5af1d04202cd Mon Sep 17 00:00:00 2001 From: Rubydesic Date: Tue, 28 May 2024 18:12:43 -0400 Subject: [PATCH] fix: errors with latest version of vs-core --- .../mod/mixin/entity/MixinEntity.java | 5 ++--- .../mod/common/BlockStateInfoProvider.kt | 5 ----- .../mod/common/DefaultBlockStateInfoProvider.kt | 5 ----- .../valkyrienskies/mod/common/ValkyrienSkiesMod.kt | 3 --- .../mod/common/command/VSCommands.kt | 14 +------------- .../mod/common/entity/VSPhysicsEntity.kt | 5 ++--- fabric/build.gradle | 5 +++++ .../trackOutlines/MixinTrackBlockOutline.java | 10 +++++----- .../trackOutlines/MixinTrackBlockOutline.java | 10 +++++----- gradle.properties | 2 +- 10 files changed, 21 insertions(+), 43 deletions(-) diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java b/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java index e8eb20a5d..c8359a9f8 100644 --- a/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java +++ b/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java @@ -31,7 +31,6 @@ import org.valkyrienskies.core.api.ships.LoadedShip; import org.valkyrienskies.core.api.ships.Ship; import org.valkyrienskies.core.api.ships.properties.ShipTransform; -import org.valkyrienskies.core.impl.game.ships.ShipObjectClient; import org.valkyrienskies.mod.common.entity.ShipMountedToData; import org.valkyrienskies.mod.common.VSGameUtilsKt; import org.valkyrienskies.mod.common.util.EntityDraggingInformation; @@ -112,8 +111,8 @@ private void preGetEyePosition(final float partialTicks, final CallbackInfoRetur final LoadedShip shipMountedTo = shipMountedToData.getShipMountedTo(); final ShipTransform shipTransform; - if (shipMountedTo instanceof ShipObjectClient) { - shipTransform = ((ShipObjectClient) shipMountedTo).getRenderTransform(); + if (shipMountedTo instanceof ClientShip) { + shipTransform = ((ClientShip) shipMountedTo).getRenderTransform(); } else { shipTransform = shipMountedTo.getShipTransform(); } diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/BlockStateInfoProvider.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/BlockStateInfoProvider.kt index 1cdd6595e..0d85a7866 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/BlockStateInfoProvider.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/BlockStateInfoProvider.kt @@ -17,11 +17,6 @@ import org.valkyrienskies.core.apigame.world.chunks.BlockType import org.valkyrienskies.mod.common.block.WingBlock import org.valkyrienskies.mod.common.config.MassDatapackResolver import org.valkyrienskies.mod.common.hooks.VSGameEvents -import org.valkyrienskies.physics_api.Lod1BlockStateId -import org.valkyrienskies.physics_api.Lod1LiquidBlockStateId -import org.valkyrienskies.physics_api.Lod1SolidBlockStateId -import org.valkyrienskies.physics_api.voxel.Lod1LiquidBlockState -import org.valkyrienskies.physics_api.voxel.Lod1SolidBlockState import java.util.function.IntFunction // Other mods can then provide weights and types based on their added content diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/DefaultBlockStateInfoProvider.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/DefaultBlockStateInfoProvider.kt index d69962eae..231e37b7a 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/DefaultBlockStateInfoProvider.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/DefaultBlockStateInfoProvider.kt @@ -4,11 +4,6 @@ import net.minecraft.world.level.block.Blocks import net.minecraft.world.level.block.LiquidBlock import net.minecraft.world.level.block.state.BlockState import org.valkyrienskies.core.apigame.world.chunks.BlockType -import org.valkyrienskies.physics_api.Lod1BlockStateId -import org.valkyrienskies.physics_api.Lod1LiquidBlockStateId -import org.valkyrienskies.physics_api.Lod1SolidBlockStateId -import org.valkyrienskies.physics_api.voxel.Lod1LiquidBlockState -import org.valkyrienskies.physics_api.voxel.Lod1SolidBlockState object DefaultBlockStateInfoProvider : BlockStateInfoProvider { override val priority: Int diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/ValkyrienSkiesMod.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/ValkyrienSkiesMod.kt index 46d3d4d17..1803a2b34 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/ValkyrienSkiesMod.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/ValkyrienSkiesMod.kt @@ -14,10 +14,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType import org.valkyrienskies.core.api.ships.setAttachment import org.valkyrienskies.core.apigame.VSCore import org.valkyrienskies.core.apigame.VSCoreClient -import org.valkyrienskies.core.impl.config.VSConfigClass -import org.valkyrienskies.core.impl.config_impl.VSCoreConfig import org.valkyrienskies.core.impl.hooks.VSEvents -import org.valkyrienskies.mod.api.VsApi import org.valkyrienskies.mod.api_impl.events.VsApiImpl import org.valkyrienskies.mod.common.blockentity.TestHingeBlockEntity import org.valkyrienskies.mod.common.config.VSGameConfig diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt index 24f40a10a..7e45e84b8 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt @@ -3,7 +3,6 @@ package org.valkyrienskies.mod.common.command import com.mojang.brigadier.CommandDispatcher import com.mojang.brigadier.arguments.ArgumentType import com.mojang.brigadier.arguments.BoolArgumentType -import com.mojang.brigadier.arguments.DoubleArgumentType import com.mojang.brigadier.arguments.StringArgumentType import com.mojang.brigadier.builder.LiteralArgumentBuilder import com.mojang.brigadier.builder.RequiredArgumentBuilder @@ -13,7 +12,6 @@ import net.minecraft.commands.CommandSourceStack import net.minecraft.commands.arguments.EntityArgument import net.minecraft.commands.arguments.coordinates.BlockPosArgument import net.minecraft.commands.arguments.coordinates.Vec3Argument -import net.minecraft.network.chat.Component import net.minecraft.network.chat.Component.translatable import net.minecraft.world.entity.Entity import net.minecraft.world.phys.BlockHitResult @@ -23,12 +21,9 @@ import org.valkyrienskies.core.api.world.ServerShipWorld import org.valkyrienskies.core.api.world.ShipWorld import org.valkyrienskies.core.apigame.ShipTeleportData import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl -import org.valkyrienskies.core.impl.game.ships.ShipData -import org.valkyrienskies.core.impl.game.ships.ShipObject import org.valkyrienskies.core.util.x import org.valkyrienskies.core.util.y import org.valkyrienskies.core.util.z -import org.valkyrienskies.mod.common.dimensionId import org.valkyrienskies.mod.common.getShipManagingPos import org.valkyrienskies.mod.common.util.toJOML import org.valkyrienskies.mod.common.util.toJOMLD @@ -77,14 +72,7 @@ object VSCommands { val r = ShipArgument.getShips(it, "ships").toList() as List val isStatic = BoolArgumentType.getBool(it, "is-static") r.forEach { ship -> - if (ship is ShipObject) { - // TODO: AAAAAAAAA THIS IS HORRIBLE how can the API support this? - (ship.shipData as ShipData).isStatic = isStatic - } else if (ship is ShipData) { - // TODO: AAAAAAAAA THIS IS HORRIBLE how can the API support this? - ship.isStatic = isStatic - } - + ship.isStatic = isStatic } it.source.sendVSMessage( translatable( diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/VSPhysicsEntity.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/VSPhysicsEntity.kt index 9fa7dd50b..0d8401c75 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/VSPhysicsEntity.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/VSPhysicsEntity.kt @@ -27,7 +27,6 @@ import org.valkyrienskies.core.apigame.world.ServerShipWorldCore import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl import org.valkyrienskies.core.impl.game.ships.ShipInertiaDataImpl import org.valkyrienskies.core.impl.game.ships.ShipObjectClientWorld -import org.valkyrienskies.core.impl.game.ships.ShipObjectServerWorld import org.valkyrienskies.core.impl.game.ships.ShipTransformImpl import org.valkyrienskies.core.impl.util.serialization.VSJacksonUtil import org.valkyrienskies.mod.common.dimensionId @@ -142,7 +141,7 @@ open class VSPhysicsEntity(type: EntityType, level: Level) : En } val physicsEntityDataAsBytes: ByteArray = compoundTag.getByteArray(PHYS_DATA_NBT_KEY) val oldPhysicsEntityData = getMapper().readValue(physicsEntityDataAsBytes) - val newShipId = (level().shipObjectWorld as ShipObjectServerWorld).allocateShipId(level().dimensionId) + val newShipId = (level().shipObjectWorld as ServerShipWorldCore).allocateShipId(level().dimensionId) val newPhysicsEntityData = oldPhysicsEntityData.copyPhysicsEntityDataWithNewId(newShipId) // Change the shipId to be something new setPhysicsEntityData(newPhysicsEntityData) @@ -199,7 +198,7 @@ open class VSPhysicsEntity(type: EntityType, level: Level) : En if (physicsEntityServerCopy != null) { val newPos = Vector3d(d, e, f) val teleportData = ShipTeleportDataImpl(newPos = newPos) - (this.level().shipObjectWorld as ShipObjectServerWorld).teleportPhysicsEntity(this.physicsEntityServer!!, teleportData) + (this.level().shipObjectWorld as ServerShipWorldCore).teleportPhysicsEntity(this.physicsEntityServer!!, teleportData) } else { physicsEntityData!!.transform = ShipTransformImpl.create( Vector3d(d, e, f), diff --git a/fabric/build.gradle b/fabric/build.gradle index 2e5490396..7d79522c7 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -67,6 +67,11 @@ dependencies { exclude group: "com.google.guava" } + def jacksonVersion = '2.14.0' + + + include("com.fasterxml:classmate:1.5.1") + implementation("com.fasterxml:classmate:1.5.1") // CC Restitched //modImplementation("curse.maven:cc-restitched-462672:3908334"){ // exclude module: "jsonschema.module.addon" diff --git a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java b/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java index f71208b95..83ad26a3a 100644 --- a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java +++ b/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java @@ -24,8 +24,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import org.valkyrienskies.core.api.ships.ClientShip; import org.valkyrienskies.core.api.ships.Ship; -import org.valkyrienskies.core.impl.game.ships.ShipObjectClient; import org.valkyrienskies.mod.common.VSClientGameUtils; import org.valkyrienskies.mod.common.VSGameUtilsKt; import org.valkyrienskies.mod.common.util.VectorConversionsMCKt; @@ -58,8 +58,8 @@ private static PoseStack redirectTransformStackTranslate(final PoseStack ms) { final Level level = Minecraft.getInstance().level; if (level != null && valkyrienskies$vec != null) { - final ShipObjectClient ship; - if ((ship = (ShipObjectClient) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$vec)) != null) { + final ClientShip ship; + if ((ship = (ClientShip) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$vec)) != null) { final Quaterniond rotation = new Quaterniond().identity(); final Quaterniond yawQuat = new Quaterniond().rotateY(valkyrienskies$angles.y); final Quaterniond pitchQuat = new Quaterniond().rotateX(valkyrienskies$angles.x); @@ -117,8 +117,8 @@ private static void harvest(final LevelRenderer context, final Camera info, fina private static void redirectTranslate(final PoseStack instance, final double d, final double e, final double f) { final Level level = Minecraft.getInstance().level; if (level != null) { - final ShipObjectClient ship; - if ((ship = (ShipObjectClient) VSGameUtilsKt.getShipManagingPos(level, + final ClientShip ship; + if ((ship = (ClientShip) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$hitResult.getBlockPos())) != null) { final Vec3 camPos = valkyrienskies$info.getPosition(); VSClientGameUtils.transformRenderWithShip(ship.getRenderTransform(), instance, diff --git a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java b/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java index be2aa2349..97c911ad6 100644 --- a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java +++ b/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/trackOutlines/MixinTrackBlockOutline.java @@ -22,8 +22,8 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import org.valkyrienskies.core.api.ships.ClientShip; import org.valkyrienskies.core.api.ships.Ship; -import org.valkyrienskies.core.impl.game.ships.ShipObjectClient; import org.valkyrienskies.mod.common.VSClientGameUtils; import org.valkyrienskies.mod.common.VSGameUtilsKt; import org.valkyrienskies.mod.common.util.VectorConversionsMCKt; @@ -58,8 +58,8 @@ private static PoseStack redirectTransformStackTranslate(final PoseStack ms) { final Level level = Minecraft.getInstance().level; if (level != null && valkyrienskies$vec != null) { - final ShipObjectClient ship; - if ((ship = (ShipObjectClient) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$vec)) != null) { + final ClientShip ship; + if ((ship = (ClientShip) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$vec)) != null) { final Quaterniond rotation = new Quaterniond().identity(); final Quaterniond yawQuat = new Quaterniond().rotateY(valkyrienskies$angles.y); final Quaterniond pitchQuat = new Quaterniond().rotateX(valkyrienskies$angles.x); @@ -115,8 +115,8 @@ private static void harvest(Block event, CallbackInfo ci) { private static void redirectTranslate(final PoseStack instance, final double d, final double e, final double f) { final Level level = Minecraft.getInstance().level; if (level != null) { - final ShipObjectClient ship; - if ((ship = (ShipObjectClient) VSGameUtilsKt.getShipManagingPos(level, + final ClientShip ship; + if ((ship = (ClientShip) VSGameUtilsKt.getShipManagingPos(level, valkyrienskies$hitResult.getBlockPos())) != null) { final Vec3 camPos = valkyrienskies$info.getPosition(); VSClientGameUtils.transformRenderWithShip(ship.getRenderTransform(), instance, diff --git a/gradle.properties b/gradle.properties index daa4f55c9..a4bae6dd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,7 @@ createbigcannons_version= 0.5.2.a create_utilities_version=0.2.1+1.20.1 energy_version=2.3.0 -vs_core_version=1.1.0+2c8004ed40 +vs_core_version=1.1.0+233880a786 # Prevent kotlin from autoincluding stdlib as a dependency, which breaks # gradle's composite builds (includeBuild) for some reason. We'll add it manually kotlin.stdlib.default.dependency=false