0.5.4.2

ThePlasticPotato · ThePlasticPotato · commit 9de2a5691c44 · 2026-01-01T13:18:46.000-05:00
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,16 @@
+## 0.5.4.2
+Hotfix #2 for 0.5.4
+
+#### Bugfixes:
+- Copter bearing crashing fabric cause I'm dumb
+- Add gas nozzle back to creative inventory for real this time
+- Readjust exhaust gas values
+- Colored wings should now place with their color when using placement helper
+- Universal joints return their item when disconnected
+- Universal joint distance is now configurable
+- Increased default Gas Thruster force by 10x
+- Maybe fix gyro and reaction wheel models
+
 ## 0.5.4.1
 Hotfix for 0.5.4
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/ClockworkConfig.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/ClockworkConfig.kt
@@ -88,6 +88,9 @@ object ClockworkConfig {
         @ConfigEntry(description = "The max size that a propeller blade can reach. Sizes higher than this will refuse to craft.")
         var maxBladeSize = 4.0
 
+        @ConfigEntry(description = "The maximum distance (in blocks) allowed between two Universal Joints while connected.", min = 1.0)
+        var maxUniversalJointDistance = 10.0
+
         @ConfigEntry(description = "The length of the raycast made by the Gas Nozzle when attempting to find a valid balloon ceiling.", min = 1.0)
         var hotAirBalloonMaxRaycastDistance = 64.0
 
@@ -116,7 +119,7 @@ object ClockworkConfig {
         var wanderOreForceMultiplier = 2.0
 
         @ConfigEntry(min = 0.0)
-        var gasThrusterForceMul = 20.0
+        var gasThrusterForceMul = 200.0
 
         @ConfigEntry(min = 0.0)
         var sugarRocketBlockThrust = 10000.0
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/kinetics/universal_shaft/UniversalShaftBlock.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/kinetics/universal_shaft/UniversalShaftBlock.kt
@@ -93,6 +93,7 @@ class UniversalShaftBlock(properties: Properties?) : DirectionalKineticBlock(pro
             if (be.connectedBe != null) be.connectedBe!!.disconnect()
             be.disconnect()
             level.playSound(null, be.blockPos, ClockworkSounds.HOSE_RELEASE.mainEvent, SoundSource.BLOCKS, 1.0f, 1.0f)
+            if (!player.isCreative) player.addItem(be.getConnectionItem())
             return InteractionResult.SUCCESS
         }
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/kinetics/universal_shaft/UniversalShaftBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/kinetics/universal_shaft/UniversalShaftBlockEntity.kt
@@ -6,9 +6,12 @@ import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.sounds.SoundSource
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
+import org.valkyrienskies.clockwork.ClockworkConfig
+import org.valkyrienskies.clockwork.ClockworkItems
 import org.valkyrienskies.clockwork.ClockworkSounds
 import org.valkyrienskies.clockwork.content.physicalities.extendon.ExtendonBlockEntity
 import org.valkyrienskies.clockwork.util.universal_joint.IUniversalJoint
@@ -23,7 +26,7 @@ class UniversalShaftBlockEntity(typeIn: BlockEntityType<*>?, pos: BlockPos?, sta
     var main: Boolean = false
 
     override val maxCreationDistance: Double
-        get() = 10.0 //todo add config
+        get() = ClockworkConfig.SERVER.maxUniversalJointDistance
 
     override fun onSpeedChanged(previousSpeed: Float) {
         super.onSpeedChanged(previousSpeed)
@@ -121,6 +124,10 @@ class UniversalShaftBlockEntity(typeIn: BlockEntityType<*>?, pos: BlockPos?, sta
         return be is UniversalShaftBlockEntity
     }
 
+    override fun getConnectionItem(): ItemStack {
+        return ClockworkItems.UNIVERSAL_SHAFT_ITEM.asStack()
+    }
+
     override fun write(compound: CompoundTag, clientPacket: Boolean) {
         if (connectedPos != null) {
             compound.putInt("otherPosX",connectedPos!!.x)
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/exhaust/ExhaustBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/exhaust/ExhaustBlockEntity.kt
@@ -18,20 +18,27 @@ import org.valkyrienskies.clockwork.ClockworkModClient
 import org.valkyrienskies.clockwork.mixinduck.MixinAirCurrentDuck
 import org.valkyrienskies.clockwork.util.KNodeBlockEntity
 import org.valkyrienskies.clockwork.util.KelvinParticleHelper
+import org.valkyrienskies.core.api.ships.PhysShip
+import org.valkyrienskies.core.api.world.PhysLevel
+import org.valkyrienskies.core.api.world.properties.DimensionId
 import org.valkyrienskies.kelvin.KelvinMod
+import org.valkyrienskies.mod.api.BlockEntityPhysicsListener
 import org.valkyrienskies.mod.common.util.toJOMLD
 import kotlin.math.floor
 import kotlin.math.min
 import kotlin.math.pow
 
 class ExhaustBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState) : KNodeBlockEntity(type, pos, state),
-    IAirCurrentSource {
-
+    IAirCurrentSource, BlockEntityPhysicsListener {
     val MASS_PER_EXHAUST = 0.0005
+
+    val facing: Direction = state.getValue(BlockStateProperties.FACING)
+
+    override lateinit var dimension: DimensionId
     // Airflow speed parameters cannot be easily made configurable because air current code runs both on server and client
     // so values need to somehow be synced.
     val MAX_AIRFLOW_SPEED = 256F // like a maxed out encased fan with default max rpm cap
-    val PRESSURE_TO_SPEED = 256F / 2500 // outflow pressure in exhausts is very low compared to thrusters, may need tweaking later
+    val PRESSURE_TO_SPEED = 256F / 2500F // outflow pressure in exhausts is very low compared to thrusters, may need tweaking later
 
     @JvmField
     var airCurrent: AirCurrent? = null
@@ -40,6 +47,10 @@ class ExhaustBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockSt
     var entitySearchCooldown: Int = 0
     var updateAirFlow: Boolean = false
 
+
+    @Volatile
+    var currentAirflowThrust: Double = 0.0
+
     init {
         airCurrent = AirCurrent(this)
         updateAirFlow = true
@@ -110,12 +121,14 @@ class ExhaustBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockSt
             sendData();
         }
 
+        currentAirflowThrust = speed.toDouble()
+
         if (speed == 0.0F)
-            return;
+            return
 
         if (entitySearchCooldown-- <= 0) {
             entitySearchCooldown = 5;
-            airCurrent!!.findEntities();
+            airCurrent!!.findEntities()
         }
 
         airCurrent!!.tick();
@@ -154,4 +167,11 @@ class ExhaustBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockSt
     override fun isSourceRemoved(): Boolean {
         return remove
     }
+
+    override fun physTick(
+        physShip: PhysShip?,
+        physLevel: PhysLevel
+    ) {
+        // will implement later
+    }
 }
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/hoseport/HosePortBlock.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/hoseport/HosePortBlock.kt
@@ -121,10 +121,10 @@ class HosePortBlock(properties: Properties) : DirectionalBlock(properties), IBE<
         val be = level.getBlockEntity(pos) as? HosePortBlockEntity? ?: return super.use(state, level, pos, player, hand, hit)
         if (player.getItemInHand(InteractionHand.MAIN_HAND).item !is BlockItem && be.connectedJoint != null) {
             be.disconnect()
-            if (!player.isCreative) player.addItem(ClockworkItems.EXTENDON_HOSE.asStack())
+            if (!player.isCreative) player.addItem(be.getConnectionItem())
             return InteractionResult.SUCCESS
         }
 
         return super.use(state, level, pos, player, hand, hit)
     }
-}
+}
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/hoseport/HosePortBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/hoseport/HosePortBlockEntity.kt
@@ -8,10 +8,12 @@ import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.item.ItemStack
 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.ClockworkGasses
+import org.valkyrienskies.clockwork.ClockworkItems
 import org.valkyrienskies.clockwork.ClockworkMod
 import org.valkyrienskies.clockwork.ClockworkModClient
 import org.valkyrienskies.clockwork.ClockworkSounds
@@ -217,6 +219,10 @@ class HosePortBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockS
         return og || other
     }
 
+    override fun getConnectionItem(): ItemStack {
+        return ClockworkItems.EXTENDON_HOSE.asStack()
+    }
+
     fun safeHeatableGoggleTooltip(tooltip: MutableList<Component>, isPlayerSneaking: Boolean): Boolean {
         var found = false
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/extendon/ExtendonBlock.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/extendon/ExtendonBlock.kt
@@ -119,7 +119,7 @@ class ExtendonBlock(properties: Properties) : DirectionalBlock(properties), IBE<
         val be = level.getBlockEntity(pos) as? ExtendonBlockEntity? ?: return super.use(state, level, pos, player, hand, hit)
         if (player.getItemInHand(InteractionHand.MAIN_HAND).item !is BlockItem && be.connectedJoint != null) {
             be.disconnect()
-            if (!player.isCreative) player.addItem(ClockworkItems.EXTENDON_HOSE.asStack())
+            if (!player.isCreative) player.addItem(be.getConnectionItem())
             return InteractionResult.SUCCESS
         }
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/extendon/ExtendonBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/extendon/ExtendonBlockEntity.kt
@@ -10,6 +10,7 @@ import net.minecraft.core.Direction
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.item.ItemStack
 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
@@ -18,6 +19,7 @@ import org.joml.AxisAngle4d
 import org.joml.Quaterniond
 import org.joml.Vector3d
 import org.valkyrienskies.clockwork.ClockworkGasses
+import org.valkyrienskies.clockwork.ClockworkItems
 import org.valkyrienskies.clockwork.ClockworkMod
 import org.valkyrienskies.clockwork.ClockworkModClient
 import org.valkyrienskies.clockwork.ClockworkSounds
@@ -208,7 +210,7 @@ class ExtendonBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: Block
     }
 
 
-    fun getShipID(): ShipId {
+    fun getShipID(): ShipId? {
         val ship = level.getShipManagingPos(blockPos)
 
         if (ship == null) return -1L
@@ -274,6 +276,10 @@ class ExtendonBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: Block
         return og || other
     }
 
+    override fun getConnectionItem(): ItemStack {
+        return ClockworkItems.EXTENDON_HOSE.asStack()
+    }
+
     fun safeHeatableGoggleTooltip(tooltip: MutableList<Component>, isPlayerSneaking: Boolean): Boolean {
         var found = false
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/util/blocktype/ConnectedWingAlike.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/util/blocktype/ConnectedWingAlike.kt
@@ -26,6 +26,8 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import org.valkyrienskies.clockwork.ClockworkBlocks
 import org.valkyrienskies.clockwork.ClockworkShapes
+import org.valkyrienskies.clockwork.content.generic.ColorBlockEntity
+import org.valkyrienskies.clockwork.content.physicalities.wing.DyedWingBlockItem
 import java.util.function.Predicate
 import kotlin.collections.getValue
 
@@ -85,8 +87,23 @@ abstract class ConnectedWingAlike(properties: Properties?) : Block(properties) {
         val placementHelper: IPlacementHelper = PlacementHelpers.get(placementHelperId);
         if (!player.isShiftKeyDown() && player.mayBuild()) {
             if (placementHelper.matchesItem(heldItem)) {
-                placementHelper.getOffset(player, level, state, pos, hit)
-                    .placeInWorld(level, (heldItem.item) as BlockItem, player, hand, hit);
+                var color = -1
+                if (heldItem.item is DyedWingBlockItem) {
+                    color = if (heldItem.hasTag() && heldItem.getOrCreateTag().contains("Clockwork\$color")) heldItem.getOrCreateTag()
+                        .getInt("Clockwork\$color") else -1
+                }
+                val offset = placementHelper.getOffset(player, level, state, pos, hit)
+                val result = offset.placeInWorld(level, (heldItem.item) as BlockItem, player, hand, hit)
+
+                if (result != InteractionResult.SUCCESS) {
+                    return result
+                }
+
+                if (level.getBlockEntity(offset.blockPos) is ColorBlockEntity) {
+                    val be: ColorBlockEntity = (level.getBlockEntity(offset.blockPos) as ColorBlockEntity)
+                    be.setColor(color)
+                }
+
                 return InteractionResult.SUCCESS;
             }
         }
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/util/universal_joint/IUniversalJoint.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/util/universal_joint/IUniversalJoint.kt
@@ -1,6 +1,7 @@
 package org.valkyrienskies.clockwork.util.universal_joint
 
 import net.minecraft.core.BlockPos
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.entity.BlockEntity
 
@@ -42,4 +43,8 @@ interface IUniversalJoint {
     fun isThisJoint(be: BlockEntity): Boolean {
         return (be is IUniversalJoint)
     }
-}
+
+    fun getConnectionItem(): ItemStack {
+        return ItemStack.EMPTY
+    }
+}
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/util/universal_joint/UniversalJointItem.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/util/universal_joint/UniversalJointItem.kt
@@ -35,7 +35,7 @@ open class UniversalJointItem<T: IUniversalJoint>(properties: Properties) : Item
         }
         else {
             val worldDistance = context.level.toWorldCoordinates(firstSelect!!.pos).distanceTo(context.level.toWorldCoordinates(tBe.pos))
-            if (worldDistance > tBe.maxCreationDistance) { //todo add joint distance config
+            if (worldDistance > tBe.maxCreationDistance) {
                 context.player!!.displayClientMessage(Component.translatable("$MOD_ID.universal_shaft.connection_failed.too_far"), true)
                 firstSelect = null
                 return fail()
diff --git a/fabric/src/main/resources/assets/vs_clockwork/models/block/gyro/block.json b/fabric/src/main/resources/assets/vs_clockwork/models/block/gyro/block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "vs_clockwork:block/gyro/gyro",
+  "loader": "porting_lib:obj",
+  "flip_v": true,
+  "model": "vs_clockwork:models/block/gyro/gyro.obj"
+}
diff --git a/fabric/src/main/resources/assets/vs_clockwork/models/block/gyro/item.json b/fabric/src/main/resources/assets/vs_clockwork/models/block/gyro/item.json
@@ -0,0 +1,18 @@
+{
+  "parent": "vs_clockwork:block/gyro/gyro",
+  "loader": "porting_lib:obj",
+  "flip_v": true,
+  "model": "vs_clockwork:models/block/gyro/gyro_item.obj",
+  "display": {
+    "gui": {
+      "rotation": [ 30, 225, 0 ],
+      "translation": [ 0, 3, 0],
+      "scale":[ 0.4, 0.4, 0.4 ]
+    },
+    "fixed": {
+      "rotation": [ 90, 0, 0 ],
+      "translation": [ 0, 0, 0],
+      "scale":[ 0.3, 0.3, 0.3 ]
+    }
+  }
+}
diff --git a/fabric/src/main/resources/assets/vs_clockwork/models/block/reactionwheel/block.json b/fabric/src/main/resources/assets/vs_clockwork/models/block/reactionwheel/block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "vs_clockwork:block/reactionwheel/reactionwheel",
+  "loader": "porting_lib:obj",
+  "flip_v": true,
+  "model": "vs_clockwork:models/block/reactionwheel/reactionwheel_shaftless.obj"
+}
diff --git a/fabric/src/main/resources/assets/vs_clockwork/models/block/reactionwheel/item.json b/fabric/src/main/resources/assets/vs_clockwork/models/block/reactionwheel/item.json
@@ -0,0 +1,18 @@
+{
+  "parent": "vs_clockwork:block/reactionwheel/reactionwheel",
+  "loader": "porting_lib:obj",
+  "flip_v": true,
+  "model": "vs_clockwork:models/block/reactionwheel/reactionwheel_shaft.obj",
+  "display": {
+    "gui": {
+      "rotation": [ 30, 225, 0 ],
+      "translation": [ 0, 0, 0],
+      "scale":[ 0.4, 0.4, 0.4 ]
+    },
+    "fixed": {
+      "rotation": [ 90, 0, 0 ],
+      "translation": [ 0, 0, 0],
+      "scale":[ 0.4, 0.4, 0.4 ]
+    }
+  }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 # Identity
 mod_name=clockwork
 mod_id=vs_clockwork
-mod_version=0.5.4.1
+mod_version=0.5.4.2
 archives_base_name=clockwork
 maven_group=org.valkyrienskies
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ class UniversalShaftBlock(properties: Properties?) : DirectionalKineticBlock(pro`
`93`	`93`	`if (be.connectedBe != null) be.connectedBe!!.disconnect()`
`94`	`94`	`be.disconnect()`
`95`	`95`	`level.playSound(null, be.blockPos, ClockworkSounds.HOSE_RELEASE.mainEvent, SoundSource.BLOCKS, 1.0f, 1.0f)`
	`96`	`+ if (!player.isCreative) player.addItem(be.getConnectionItem())`
`96`	`97`	`return InteractionResult.SUCCESS`
`97`	`98`	`}`
`98`	`99`
Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,10 @@ class HosePortBlock(properties: Properties) : DirectionalBlock(properties), IBE<`
`121`	`121`	`val be = level.getBlockEntity(pos) as? HosePortBlockEntity? ?: return super.use(state, level, pos, player, hand, hit)`
`122`	`122`	`if (player.getItemInHand(InteractionHand.MAIN_HAND).item !is BlockItem && be.connectedJoint != null) {`
`123`	`123`	`be.disconnect()`
`124`		`- if (!player.isCreative) player.addItem(ClockworkItems.EXTENDON_HOSE.asStack())`
	`124`	`+ if (!player.isCreative) player.addItem(be.getConnectionItem())`
`125`	`125`	`return InteractionResult.SUCCESS`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`return super.use(state, level, pos, player, hand, hit)`
`129`	`129`	`}`
`130`		`-}`
	`130`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class ExtendonBlock(properties: Properties) : DirectionalBlock(properties), IBE<`
`119`	`119`	`val be = level.getBlockEntity(pos) as? ExtendonBlockEntity? ?: return super.use(state, level, pos, player, hand, hit)`
`120`	`120`	`if (player.getItemInHand(InteractionHand.MAIN_HAND).item !is BlockItem && be.connectedJoint != null) {`
`121`	`121`	`be.disconnect()`
`122`		`- if (!player.isCreative) player.addItem(ClockworkItems.EXTENDON_HOSE.asStack())`
	`122`	`+ if (!player.isCreative) player.addItem(be.getConnectionItem())`
`123`	`123`	`return InteractionResult.SUCCESS`
`124`	`124`	`}`
`125`	`125`