aaaa

alex-s168 · Jan 16, 2024 · 749c185 · 749c185
1 parent d1f91e8
commit 749c185
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentConfig.kt b/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentConfig.kt
@@ -66,7 +66,7 @@ object TournamentConfig {
         var propellerBigForce = 10000.0
 
         @JsonSchema(description = "The max speed of a big propeller at max redstone input")
-        var propellerBigSpeed = 8.0f
+        var propellerBigSpeed = 7.0f
 
         @JsonSchema(description = "The acceleration of a big propeller. (deaccel = accel * 2)")
         var propellerBigAccel = 0.1f

diff --git a/common/src/main/kotlin/org/valkyrienskies/tournament/blockentity/PropellerBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/tournament/blockentity/PropellerBlockEntity.kt
@@ -19,8 +19,8 @@ class PropellerBlockEntity(
 ): BlockEntity(TournamentBlockEntities.PROPELLER.get(), pos, state) {
 
     var signal: Int = -1
-    var rotation: Float = 0.0f
-    var speed: Float = 0.0f
+    var rotation: Double = 0.0
+    var speed: Double = 0.0
 
     fun tick(level: Level) {
         if (signal == -1) {
@@ -33,10 +33,10 @@ class PropellerBlockEntity(
             speed -= accel * 2
         }
         if (speed < 0.0f) {
-            speed = 0.0f
+            speed = 0.0
         }
-        rotation += speed
-        rotation %= 360.0f
+        rotation -= speed
+        rotation %= 360.0
     }
 
     companion object {
@@ -54,16 +54,16 @@ class PropellerBlockEntity(
         ClientboundBlockEntityDataPacket.create(this)
 
     override fun saveAdditional(tag: CompoundTag) {
-        tag.putFloat("speed", speed)
-        tag.putFloat("rotation", rotation)
+        tag.putDouble("speed", speed)
+        tag.putDouble("rotation", rotation)
         tag.putInt("signal", signal)
 
         super.saveAdditional(tag)
     }
 
     override fun load(tag: CompoundTag) {
-        speed = tag.getFloat("speed")
-        rotation = tag.getFloat("rotation")
+        speed = tag.getDouble("speed")
+        rotation = tag.getDouble("rotation")
         signal = tag.getInt("signal")
 
         super.load(tag)

diff --git a/...ain/kotlin/org/valkyrienskies/tournament/blockentity/render/PropellerBlockEntityRender.kt b/...ain/kotlin/org/valkyrienskies/tournament/blockentity/render/PropellerBlockEntityRender.kt
@@ -24,7 +24,7 @@ class PropellerBlockEntityRender:
         pose.pose {
             translate(0.5, 0.5, 0.5)
             mulPose(be.blockState.getValue(DirectionalBlock.FACING).opposite.rotation)
-            pose.mulPose(Vector3f.YP.rotationDegrees(be.rotation))
+            pose.mulPose(Vector3f.YP.rotationDegrees(be.rotation.toFloat()))
             translate(-0.5, -0.5, -0.5)
             TournamentModels.PROP_BIG.renderer.render(
                 pose,

diff --git a/common/src/main/kotlin/org/valkyrienskies/tournament/ship/TournamentShips.kt b/common/src/main/kotlin/org/valkyrienskies/tournament/ship/TournamentShips.kt
@@ -2,11 +2,12 @@ package org.valkyrienskies.tournament.ship
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.google.common.util.concurrent.AtomicDouble
 import net.minecraft.core.BlockPos
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.level.Level
+import net.minecraft.world.phys.AABB
 import org.joml.Vector3d
 import org.joml.Vector3i
+import org.joml.primitives.AABBd
 import org.valkyrienskies.core.api.ships.*
 import org.valkyrienskies.core.apigame.world.properties.DimensionId
 import org.valkyrienskies.core.impl.game.ships.PhysShipImpl
@@ -52,7 +53,7 @@ class TournamentShips: ShipForcesInducer {
     data class PropellerData(
         val pos: Vector3i,
         val force: Vector3d,
-        var speed: Float,
+        var speed: AtomicDouble,
         var touchingWater: Boolean
     )
 
@@ -80,6 +81,7 @@ class TournamentShips: ShipForcesInducer {
                 }
 
                 propellers.forEach { p ->
+                    // TODO: check if water is on the outside if big propeller
                     val water = lvl.isWaterAt(
                         Helper3d
                             .convertShipToWorldSpace(lvl, p.pos.toDouble())
@@ -94,7 +96,7 @@ class TournamentShips: ShipForcesInducer {
                     ) as PropellerBlockEntity?
 
                     if (be != null) {
-                        p.speed = be.speed
+                        p.speed.set(be.speed)
                     }
                 }
             }
@@ -113,9 +115,9 @@ class TournamentShips: ShipForcesInducer {
             val tPos = pos.toDouble().add(0.5, 0.5, 0.5).sub(physShip.transform.positionInShip)
 
             if (force.isFinite && (
-                        TournamentConfig.SERVER.thrusterShutoffSpeed == -1.0
-                                || physShip.poseVel.vel.length() < TournamentConfig.SERVER.thrusterShutoffSpeed
-                        )
+                TournamentConfig.SERVER.thrusterShutoffSpeed == -1.0
+                    || physShip.poseVel.vel.length() < TournamentConfig.SERVER.thrusterShutoffSpeed
+                )
             ) {
                 physShip.applyInvariantForceToPos(tForce.mul(TournamentConfig.SERVER.thrusterSpeed * tier), tPos)
             }
@@ -172,7 +174,7 @@ class TournamentShips: ShipForcesInducer {
             val tPos = pos.toDouble().add(0.5, 0.5, 0.5).sub(physShip.transform.positionInShip)
             val tForce = physShip.transform.shipToWorld.transformDirection(force, Vector3d())
 
-            physShip.applyInvariantForceToPos(tForce.mul(speed.toDouble()), tPos)
+            physShip.applyInvariantForceToPos(tForce.mul(speed.get()), tPos)
         }
     }
 
@@ -231,7 +233,7 @@ class TournamentShips: ShipForcesInducer {
     }
 
     fun addPropeller(pos: Vector3i, force: Vector3d) {
-        propellers.add(PropellerData(pos, force, 0.0f, false))
+        propellers += PropellerData(pos, force, AtomicDouble(), false)
     }
 
     fun removePropeller(pos: Vector3i) {