Fix copter bearing

Author: ThePlasticPotato

common/src/main/kotlin/org/valkyrienskies/clockwork/content/contraptions/propeller/PropellerBearingBlockEntity.kt

@@ -228,12 +228,12 @@ open class PropellerBearingBlockEntity(type: BlockEntityType<*>, pos: BlockPos,
             active = !overStressed && !stalled
             updateSpinDir(currentOmega < 0)
             val lastTargetOmega = targetOmega
-            targetOmega = convertToAngular(this.getSpeed()).toDouble() * (if (isInverted()) -1.0 else 1.0) * 8.0
+            targetOmega = convertToAngular(this.getSpeed()).toDouble() * (if (isInverted()) -1.0 else 1.0)
 
             if (lastTargetOmega != targetOmega) {
                 sendData()
             }
-            currentOmega += Mth.clamp((targetOmega - currentOmega) / 10.0 / (if (starting) (targetOmega.absoluteValue + 1.0 - min(startingProgress.toDouble(), targetOmega.absoluteValue)) else 1.0), convertToAngular(-32f).toDouble(), convertToAngular(32f).toDouble())
+            currentOmega += Mth.clamp((targetOmega - currentOmega) / 2.0 / (if (starting) (targetOmega.absoluteValue + 1.0 - min(startingProgress.toDouble(), targetOmega.absoluteValue)) else 1.0), convertToAngular(-32f).toDouble(), convertToAngular(32f).toDouble())
         } else {
             active = false
             disassemblyProgress--
@@ -347,7 +347,7 @@ open class PropellerBearingBlockEntity(type: BlockEntityType<*>, pos: BlockPos,
         angle = 0.0
         currentOmega = 0.0
 
-        targetOmega = convertToAngular(this.getSpeed()).toDouble() * (if (isInverted()) -1.0 else 1.0) * 8.0
+        targetOmega = convertToAngular(this.getSpeed()).toDouble() * (if (isInverted()) -1.0 else 1.0)
 
         getBlades()
         if (brass && blades.isEmpty()) {

common/src/main/kotlin/org/valkyrienskies/clockwork/content/contraptions/propeller/copter/CopterBearingBlockEntity.kt

@@ -327,6 +327,7 @@ class CopterBearingBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: B
     }
 
     override fun applyPowerEffect() {
+        if (powerOne == 0 && powerTwo == 0) return
         val (axisOne, axisTwo) = getPowerDirections()
         val positiveNormalOne = Direction.get(POSITIVE, axisOne).normal.toJOMLD()
         val positiveNormalTwo = Direction.get(POSITIVE, axisTwo).normal.toJOMLD()
@@ -346,7 +347,7 @@ class CopterBearingBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: B
             return 1f
         }
         val facing = blockState.getValue(BlockStateProperties.FACING)
-        speed = convertToDirection(speed, facing)
+        speed = -convertToDirection(speed, facing)
         if (rotationDirection.value == 1) {
             speed *= -1f
         }

common/src/main/kotlin/org/valkyrienskies/clockwork/content/forces/PropellerController.kt

@@ -289,7 +289,7 @@ class PropellerController(
             val bladeWidth = if (blade.wide) 0.375 else 0.25
             // TODO: multiply internal RPM of propeller by 8.0
             // bearingSpeed is in deg/t, convert to rev/s
-            val bladeRotationalSpeed = abs(physProp.bearingSpeed/360.0*20.0)// * 8.0 // Unit in rev/s
+            val bladeRotationalSpeed = abs(physProp.bearingSpeed/360.0*20.0) * 8.0 // Unit in rev/s
 
             val power = calculateBladePower(velocityTowardsPropellerDir,
                 bladeRotationalSpeed, blade.length, blade.angle, bladeWidth)

common/src/main/resources/data/vs_clockwork/vs_entities/copter_contraption.json

@@ -0,0 +1,3 @@
+{
+  "handler": "valkyrienskies:shipyard"
+}