Add flap bearing peripheral

Author: blockninja124

common/src/main/kotlin/org/valkyrienskies/clockwork/ClockworkConfig.kt

@@ -177,5 +177,8 @@ object ClockworkConfig {
 
         @ConfigEntry(description = "Maximum amount of blocks a smart flap bearing can assemble", min = 0.0, max = Int.MAX_VALUE.toDouble())
         var smartFlapBearingMaxSize = 24
+
+        @ConfigEntry(description = "Whether the (smart) flap bearing peripheral can use setAngle without rotational power")
+        var cheatFlapBearingPeripheral = false
     }
 }

common/src/main/kotlin/org/valkyrienskies/clockwork/content/contraptions/flap/FlapBearingBlockEntity.kt

@@ -41,6 +41,11 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
     private var lastPower: Int = 0
     private var currentPower: Int = 0
 
+    /**
+     * Only used by the CC peripheral so that it can set the angle manually
+     * without it resetting / being meddled with by redstone
+     */
+    var isLocked = false
 
     val angularSpeed: Double
         get() {
@@ -64,6 +69,9 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
             assemble()
         }
 
+        // Don't update from redstone if we're locked
+        if (isLocked) return
+
         lastPower = currentPower
         currentPower = getPower()
 
@@ -80,6 +88,7 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
         bearingAngle.setValue(tag.getFloat("BearingAngle").toDouble())
         bearingAngle.chase(tag.getFloat("TargetAngle").toDouble(), tag.getDouble("AngularSpeed"), chaser)
         isRunning = tag.getBoolean("IsRunning")
+        isLocked = tag.getBoolean("IsLocked")
 
         lastException = AssemblyException.read(tag)
 
@@ -91,6 +100,7 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
         tag.putFloat("TargetAngle",bearingAngle.chaseTarget)
         tag.putBoolean("IsRunning",isRunning)
         tag.putDouble("AngularSpeed",angularSpeed)
+        tag.putBoolean("IsLocked", isLocked)
 
         AssemblyException.write(tag,lastAssemblyException)
     }

common/src/main/kotlin/org/valkyrienskies/clockwork/integration/cc/FlapBearingPeripheral.kt

@@ -0,0 +1,78 @@
+@file:Suppress("unused")
+
+package org.valkyrienskies.clockwork.integration.cc
+
+import dan200.computercraft.api.lua.LuaException
+import dan200.computercraft.api.lua.LuaFunction
+import dan200.computercraft.api.peripheral.IPeripheral
+import net.createmod.catnip.animation.LerpedFloat
+import org.valkyrienskies.clockwork.ClockworkBlocks
+import org.valkyrienskies.clockwork.ClockworkConfig
+import org.valkyrienskies.clockwork.ClockworkMod
+import org.valkyrienskies.clockwork.content.contraptions.flap.FlapBearingBlockEntity
+import org.valkyrienskies.clockwork.content.contraptions.flap.smart_flap.SmartFlapBearingBlockEntity
+import org.valkyrienskies.clockwork.content.logistics.gas.pockets.nozzle.GasNozzleBlockEntity
+import java.util.Optional
+
+class FlapBearingPeripheral(private val be: FlapBearingBlockEntity): IPeripheral {
+
+    @LuaFunction
+    fun isSmart(): Boolean = be is SmartFlapBearingBlockEntity
+
+    @LuaFunction
+    fun getAngle(): Float = be.getInterpolatedAngle(0.0f)
+
+    // Note: CC does not accept Float arguments, only Doubles.
+    // CC also doesn't understand kotlin optional parameters,
+    // so we use a Java Optional instead.
+    @LuaFunction
+    fun setAngle(angle: Double, setLocked: Optional<Boolean>) {
+        if (be !is SmartFlapBearingBlockEntity) {
+            throw LuaException("setAngle can only be used on a smart flap bearing")
+        }
+
+        if (!(be.angularSpeed > 0) && !ClockworkConfig.SERVER.cheatFlapBearingPeripheral) {
+            throw LuaException("Flap bearing is not connected to power")
+        }
+
+        if (!be.isRunning) {
+            throw LuaException("Flap bearing is not assembled")
+        }
+
+        if (setLocked.isPresent) {
+            be.isLocked = setLocked.get()
+        } else {
+            be.isLocked = true
+        }
+
+        be.setAngle(angle.toFloat())
+    }
+
+    @LuaFunction
+    fun isLocked(): Boolean = be.isLocked
+
+    @LuaFunction
+    fun setLocked(locked: Boolean) {
+        be.isLocked = locked
+    }
+
+    @LuaFunction(mainThread = true)
+    fun isRunning(): Boolean = be.isRunning
+
+    @LuaFunction(mainThread = true)
+    fun assemble(): Boolean {
+        if (be.isRunning) return false
+        be.assemble()
+        return true
+    }
+
+    @LuaFunction(mainThread = true)
+    fun disassemble(): Boolean {
+        if (!be.isRunning) return false
+        be.disassemble()
+        return true
+    }
+
+    override fun equals(p0: IPeripheral?): Boolean = be.blockPos == (p0 as? FlapBearingPeripheral)?.be?.blockPos
+    override fun getType(): String = "cw_flap_bearing"
+}

common/src/main/kotlin/org/valkyrienskies/clockwork/integration/cc/getPeripheralCommon.kt

@@ -5,12 +5,15 @@ import net.minecraft.core.Direction
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import org.valkyrienskies.clockwork.ClockworkBlockEntities
+import org.valkyrienskies.clockwork.content.contraptions.flap.FlapBearingBlockEntity
 import org.valkyrienskies.clockwork.content.contraptions.phys.bearing.PhysBearingBlockEntity
 import org.valkyrienskies.clockwork.content.logistics.gas.pockets.nozzle.GasNozzleBlockEntity
 
 val PERIPHERALS = mapOf<BlockEntityType<*>, (BlockEntity, Direction?) -> IPeripheral>(
     ClockworkBlockEntities.PHYS_BEARING.get() to {be, _ -> PhysBearingPeripheral(be as PhysBearingBlockEntity)},
-    ClockworkBlockEntities.GAS_NOZZLE.get() to {be, _ -> GasNozzlePeripheral(be as GasNozzleBlockEntity)}
+    ClockworkBlockEntities.GAS_NOZZLE.get() to {be, _ -> GasNozzlePeripheral(be as GasNozzleBlockEntity)},
+    ClockworkBlockEntities.FLAP_BEARING.get() to {be, _ -> FlapBearingPeripheral(be as FlapBearingBlockEntity)},
+    ClockworkBlockEntities.SMART_FLAP_BEARING.get() to {be, _ -> FlapBearingPeripheral(be as FlapBearingBlockEntity)}
 )
 
 fun getPeripheralCommon(be: BlockEntity, direction: Direction?): IPeripheral? = PERIPHERALS[be.type]?.invoke(be, direction)