Added wall heat capacity and conductivity to duct nodes.

chj990707 · chj990707 · commit ec7575837674 · 2026-01-16T15:37:19.000+09:00
Added wall temperature to the goggle tooltip.
diff --git a/Kelvin b/Kelvin
@@ -1 +1 @@
-Subproject commit ad27706cf1cce5cd38306bf77a0098dc3837d922
+Subproject commit a5ff6bbff0111dce62edeb1f60ff92c1c747b35b
diff --git a/common/src/main/java/org/valkyrienskies/clockwork/mixin/content/gas/MixinComposterBlock.java b/common/src/main/java/org/valkyrienskies/clockwork/mixin/content/gas/MixinComposterBlock.java
@@ -68,7 +68,7 @@ public MixinComposterBlock(Properties properties) {
     @NotNull
     @Override
     public DuctNode createNode(@NotNull DuctNodePos pos) {
-        return new PipeDuctNode(pos, NodeBehaviorType.PIPE, new HashSet<>(),1.0, 16375049.0, 1478.0);
+        return new PipeDuctNode(pos, NodeBehaviorType.PIPE, new HashSet<>(),1.0, 16375049.0, 1478.0, 1687.5, 44.9);
     }
 
     @Override
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/IClockworkNodeBE.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/IClockworkNodeBE.kt
@@ -39,6 +39,18 @@ interface IClockworkNodeBE: INodeBlockEntity, IHaveGoggleInformation {
             }
         }
         kelvin.getTemperatureAt(pos).let { temp ->
+            found = true
+            ClockworkLang.builder().apply {
+                add(ClockworkLang.translate(
+                    "gui.ductInfo.temperature",
+                    DuctTextUtil.translateTemperature(ClockworkLang.builder(), temp, true)
+                ))
+                style(ChatFormatting.GOLD)
+                forGoggles(tooltip, 0)
+            }
+        }
+
+        kelvin.getWallTemperatureAt(pos).let { temp ->
             found = true
             ClockworkLang.builder().apply {
                 val max = blockStats?.getMaximumTemperature()
@@ -47,7 +59,7 @@ interface IClockworkNodeBE: INodeBlockEntity, IHaveGoggleInformation {
 
                 if (critical) text("!! ")
                 add(ClockworkLang.translate(
-                    "gui.ductInfo.temperature",
+                    "gui.ductInfo.wallTemperature",
                     DuctTextUtil.translateTemperature(ClockworkLang.builder(), temp, true)
                 ))
                 style(ChatFormatting.GOLD)
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/backtank/GasBacktankBlock.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/backtank/GasBacktankBlock.kt
@@ -77,7 +77,7 @@ class GasBacktankBlock(properties: Properties) : HorizontalDirectionalBlock(prop
     }
 
     override fun createNode(pos: DuctNodePos): DuctNode {
-        return TankDuctNode(pos = pos, behavior =  NodeBehaviorType.TANK, volume = 0.75, maxPressure = 16375049.0, maxTemperature = 1478.0, size = 3.0)
+        return TankDuctNode(pos = pos, behavior =  NodeBehaviorType.TANK, volume = 0.75, maxPressure = 16375049.0, maxTemperature = 1478.0, size = 3.0, heatConductivity = 1687.5, heatCapacity = 44.9)
     }
 
     override fun onPlace(state: BlockState, level: Level, pos: BlockPos, oldState: BlockState, isMoving: Boolean) {
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/duct/DuctPipeNode.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/duct/DuctPipeNode.kt
@@ -8,7 +8,7 @@ import org.valkyrienskies.kelvin.api.nodes.ILeakNode
 import org.valkyrienskies.kelvin.api.nodes.PipeDuctNode
 import org.valkyrienskies.kelvin.util.KelvinExtensions.toMinecraft
 
-class DuctPipeNode(pos: DuctNodePos, volume: Double, maxPressure: Double, maxTemperature: Double) : PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = volume, maxPressure = maxPressure, maxTemperature = maxTemperature), ILeakNode {
+class DuctPipeNode(pos: DuctNodePos, volume: Double, maxPressure: Double, maxTemperature: Double) : PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = volume, maxPressure = maxPressure, maxTemperature = maxTemperature, heatConductivity = 1687.5, heatCapacity = 44.9), ILeakNode {
 
     override fun getLeakRatio(level: Level): Double {
         val state = level.getBlockState(pos.toMinecraft())
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/storage/tank/DuctTankBlock.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/storage/tank/DuctTankBlock.kt
@@ -69,7 +69,7 @@ class DuctTankBlock(properties: Properties) : Block(properties), INodeBlock, IBE
     }
 
     fun createTankNode(pos: DuctNodePos, size: Double): DuctNode {
-        return TankDuctNode(pos, NodeBehaviorType.TANK, volume = size, maxPressure = 16375049.0, maxTemperature = 1478.0)
+        return TankDuctNode(pos, NodeBehaviorType.TANK, volume = size, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)
     }
 
     override fun onPlace(state: BlockState, level: Level, pos: BlockPos, oldState: BlockState, isMoving: Boolean) {
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/util/DuctNetworkUtils.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/util/DuctNetworkUtils.kt
@@ -13,11 +13,11 @@ import org.valkyrienskies.kelvin.api.nodes.PumpDuctNode
 
 object DuctNetworkUtils {
     fun createPipeNode(pos: DuctNodePos): PipeDuctNode {
-        return PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0)
+        return PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)
     }
 
     fun createPumpNode(pos: DuctNodePos): PumpDuctNode {
-        return PumpDuctNode(pos, NodeBehaviorType.PUMP, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0)
+        return PumpDuctNode(pos, NodeBehaviorType.PUMP, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)
     }
 
     fun createPipeEdge(nodeA: DuctNodePos, nodeB: DuctNodePos): PipeDuctEdge {
diff --git a/common/src/main/kotlin/org/valkyrienskies/clockwork/util/render/VirtualDuctNetwork.kt b/common/src/main/kotlin/org/valkyrienskies/clockwork/util/render/VirtualDuctNetwork.kt
@@ -73,6 +73,10 @@ class VirtualDuctNetwork(
         TODO("Not yet implemented")
     }
 
+    override fun getWallTemperatureAt(node: DuctNodePos): Double {
+        TODO("Not yet implemented")
+    }
+
     override fun markChunkLoaded(pos: KelvinChunkPos) {
         TODO("Not yet implemented")
     }
diff --git a/common/src/main/resources/assets/vs_clockwork/lang/en_us.json b/common/src/main/resources/assets/vs_clockwork/lang/en_us.json
@@ -456,6 +456,7 @@
   "vs_clockwork.gui.ductInfo.title": "Duct Info:",
   "vs_clockwork.gui.ductInfo.volume": "Volume: %s",
   "vs_clockwork.gui.ductInfo.temperature": "Temperature: %s",
+  "vs_clockwork.gui.ductInfo.wallTemperature": "Wall Temperature: %s",
   "vs_clockwork.gui.ductInfo.pressure": "Pressure: %s",
   "vs_clockwork.gui.ductInfo.energy": "Thermal Energy: %s",
   "vs_clockwork.gui.ductInfo.out_of": " / %s",
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ parchment_version = 2023.09.03
 vs2_version=2.4.8.1+40011b4af2
 vscore_version=1.1.0+015e8fde3f
 # Kelvin
-kelvin_version=0.4.0+ad27706cf1
+kelvin_version=0.4.0+a5ff6bbff0
 
 # Fabric
 # https://fabricmc.net/develop/

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public MixinComposterBlock(Properties properties) {`
`68`	`68`	`@NotNull`
`69`	`69`	`@Override`
`70`	`70`	`public DuctNode createNode(@NotNull DuctNodePos pos) {`
`71`		`- return new PipeDuctNode(pos, NodeBehaviorType.PIPE, new HashSet<>(),1.0, 16375049.0, 1478.0);`
	`71`	`+ return new PipeDuctNode(pos, NodeBehaviorType.PIPE, new HashSet<>(),1.0, 16375049.0, 1478.0, 1687.5, 44.9);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class GasBacktankBlock(properties: Properties) : HorizontalDirectionalBlock(prop`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`override fun createNode(pos: DuctNodePos): DuctNode {`
`80`		`- return TankDuctNode(pos = pos, behavior = NodeBehaviorType.TANK, volume = 0.75, maxPressure = 16375049.0, maxTemperature = 1478.0, size = 3.0)`
	`80`	`+ return TankDuctNode(pos = pos, behavior = NodeBehaviorType.TANK, volume = 0.75, maxPressure = 16375049.0, maxTemperature = 1478.0, size = 3.0, heatConductivity = 1687.5, heatCapacity = 44.9)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`override fun onPlace(state: BlockState, level: Level, pos: BlockPos, oldState: BlockState, isMoving: Boolean) {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class DuctTankBlock(properties: Properties) : Block(properties), INodeBlock, IBE`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`fun createTankNode(pos: DuctNodePos, size: Double): DuctNode {`
`72`		`- return TankDuctNode(pos, NodeBehaviorType.TANK, volume = size, maxPressure = 16375049.0, maxTemperature = 1478.0)`
	`72`	`+ return TankDuctNode(pos, NodeBehaviorType.TANK, volume = size, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`override fun onPlace(state: BlockState, level: Level, pos: BlockPos, oldState: BlockState, isMoving: Boolean) {`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ import org.valkyrienskies.kelvin.api.nodes.PumpDuctNode`
`13`	`13`
`14`	`14`	`object DuctNetworkUtils {`
`15`	`15`	`fun createPipeNode(pos: DuctNodePos): PipeDuctNode {`
`16`		`- return PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0)`
	`16`	`+ return PipeDuctNode(pos, NodeBehaviorType.PIPE, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`fun createPumpNode(pos: DuctNodePos): PumpDuctNode {`
`20`		`- return PumpDuctNode(pos, NodeBehaviorType.PUMP, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0)`
	`20`	`+ return PumpDuctNode(pos, NodeBehaviorType.PUMP, volume = 0.25, maxPressure = 16375049.0, maxTemperature = 1478.0, heatConductivity = 1687.5, heatCapacity = 44.9)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`fun createPipeEdge(nodeA: DuctNodePos, nodeB: DuctNodePos): PipeDuctEdge {`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,10 @@ class VirtualDuctNetwork(`
`73`	`73`	`TODO("Not yet implemented")`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ override fun getWallTemperatureAt(node: DuctNodePos): Double {`
	`77`	`+ TODO("Not yet implemented")`
	`78`	`+ }`
	`79`	`+`
`76`	`80`	`override fun markChunkLoaded(pos: KelvinChunkPos) {`
`77`	`81`	`TODO("Not yet implemented")`
`78`	`82`	`}`