Improve flap bearing max size config

Author: blockninja124

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

@@ -172,7 +172,10 @@ object ClockworkConfig {
         @ConfigEntry(description = "The density mult of wanderlite ore in meteors", min = 0.0)
         val meteor_density = 0.0
 
-        @ConfigEntry(description = "Maximum size of an assembled flap bearing", min = 0.0, max = Int.MAX_VALUE.toDouble())
+        @ConfigEntry(description = "Maximum amount of blocks a flap bearing can assemble", min = 0.0, max = Int.MAX_VALUE.toDouble())
         var flapBearingMaxSize = 16
+
+        @ConfigEntry(description = "Maximum amount of blocks a smart flap bearing can assemble", min = 0.0, max = Int.MAX_VALUE.toDouble())
+        var smartFlapBearingMaxSize = 24
     }
 }

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

@@ -19,12 +19,13 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
+import org.valkyrienskies.clockwork.ClockworkBlockEntities
 import org.valkyrienskies.clockwork.ClockworkConfig
 import org.valkyrienskies.clockwork.ClockworkMod
 import org.valkyrienskies.clockwork.content.contraptions.flap.contraption.FlapContraption
 import org.valkyrienskies.core.impl.shadow.re
 
-open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: BlockState, val maxSize: Long = ClockworkConfig.SERVER.flapBearingMaxSize.toLong()) :
+open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: BlockState) :
     KineticBlockEntity(type, pos, state), IBearingBlockEntity, IDisplayAssemblyExceptions {
 
     var isRunning = false
@@ -136,8 +137,8 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
 
         if (contraption == null) return
         if (contraption.blocks.isEmpty()) return
-        if (contraption.blocks.size > maxSize && maxSize != -1L) {
-            lastException = AssemblyException("structureTooLarge", maxSize)
+        if (contraption.blocks.size > getMaxSize() && getMaxSize() != -1) {
+            lastException = AssemblyException("structureTooLarge", getMaxSize())
             return sendData()
         }
         val anchor = worldPosition.relative(direction)
@@ -240,4 +241,8 @@ open class FlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
     override fun getLastAssemblyException(): AssemblyException? {
         return lastException
     }
+
+    open fun getMaxSize(): Int {
+        return ClockworkConfig.SERVER.flapBearingMaxSize
+    }
 }

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

@@ -1,17 +1,19 @@
 package org.valkyrienskies.clockwork.content.contraptions.flap.smart_flap
 
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
+import org.valkyrienskies.clockwork.ClockworkConfig
 import org.valkyrienskies.clockwork.content.contraptions.flap.FlapBearingBlockEntity
 import org.valkyrienskies.clockwork.content.contraptions.flap.dual_link.DualLinkBehaviour
 import org.valkyrienskies.clockwork.content.contraptions.flap.dual_link.FlapBearingFrequencySlot
 
-class SmartFlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: BlockState): FlapBearingBlockEntity(type,pos,state,-1L) {
+class SmartFlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: BlockState): FlapBearingBlockEntity(type,pos,state) {
 
     var firstReceivedSignal = 0
     var secondReceivedSignal = 0
@@ -54,4 +56,8 @@ class SmartFlapBearingBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, stat
         secondReceivedSignal = power
     }
 
+    override fun getMaxSize(): Int {
+        return ClockworkConfig.SERVER.smartFlapBearingMaxSize
+    }
+
 }