Skip to content

Commit 8686524

Browse files
blockninja124blockninja124
committed
Remove all the left-over clockwork aerodynamic stuff which has been moved to VS
1 parent 6c7ec1f commit 8686524

File tree

11 files changed

+23
-624
lines changed

11 files changed

+23
-624
lines changed

‎common/src/main/kotlin/org/valkyrienskies/clockwork/ClockworkMod.kt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,6 @@ object ClockworkMod {
162162
DualLinkHandler.handler(player, hand, pos, face)
163163
})
164164

165-
CommandRegistrationEvent.EVENT.register { dispatcher, context, idk ->
166-
dispatcher.register(LiteralArgumentBuilder.literal<CommandSourceStack>("get-air-values").executes {
167-
val level = it.source.level!!
168-
val player = it.source.player!!
169-
170-
val density = level.shipObjectWorld.aerodynamicUtils.getAirTemperatureForY(player.position().y(),level.dimensionId)
171-
val temperature = level.shipObjectWorld.aerodynamicUtils.getAirTemperatureForY(player.position().y(),level.dimensionId)
172-
173-
player.sendSystemMessage(Component.translatable("$MOD_ID.command.get_air_values", player.position().y.roundToInt(), density.roundToInt(), temperature.roundToInt()))
174-
175-
0
176-
})
177-
178-
}
179-
180165
vsApi.collisionStartEvent.on(CollisionSoundEffectHandler::onCollide)
181166

182167
vsApi.physTickEvent.on {

‎common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/generation/compressor/AirCompressorBlockEntity.kt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@ import net.minecraft.core.BlockPos
55
import net.minecraft.nbt.CompoundTag
66
import net.minecraft.network.chat.CommonComponents
77
import net.minecraft.network.chat.Component
8+
import net.minecraft.server.level.ServerLevel
89
import net.minecraft.world.level.block.entity.BlockEntityType
910
import net.minecraft.world.level.block.state.BlockState
1011
import org.valkyrienskies.clockwork.ClockworkConfig;
1112
import org.valkyrienskies.clockwork.ClockworkLang
1213
import org.valkyrienskies.clockwork.ClockworkMod
13-
import org.valkyrienskies.clockwork.util.AerodynamicUtils
1414
import org.valkyrienskies.clockwork.util.KNodeKineticBlockEntity
1515
import org.valkyrienskies.clockwork.util.gui.ClockworkTooltipHelper
1616
import org.valkyrienskies.clockwork.util.gui.DuctTextUtil
17+
import org.valkyrienskies.core.api.util.AerodynamicUtils
1718
import org.valkyrienskies.kelvin.impl.registry.GasTypeRegistry
1819
import org.valkyrienskies.mod.api.dimensionId
20+
import org.valkyrienskies.mod.api.shipWorld
21+
import org.valkyrienskies.mod.common.ValkyrienSkiesMod
22+
import org.valkyrienskies.mod.common.shipObjectWorld
1923
import org.valkyrienskies.mod.common.toWorldCoordinates
24+
import org.valkyrienskies.mod.common.vsCore
2025
import kotlin.math.abs
2126
import kotlin.math.max
2227

@@ -42,12 +47,12 @@ class AirCompressorBlockEntity(typeIn: BlockEntityType<*>, pos: BlockPos, state:
4247

4348
fun getAirDensity(): Double {
4449
val position = level.toWorldCoordinates(blockPos)
45-
return AerodynamicUtils.getAirDensityForY(position.y, level!!.dimensionId)
50+
return vsCore.dummyShipWorldServer.aerodynamicUtils.getAirDensityForY(position.y, level!!.dimensionId)
4651
}
4752

4853
fun getAirTemperature(): Double {
4954
val position = level.toWorldCoordinates(blockPos)
50-
return AerodynamicUtils.getAirTemperatureForY(position.y, level!!.dimensionId)
55+
return vsCore.dummyShipWorldServer.aerodynamicUtils.getAirTemperatureForY(position.y, level!!.dimensionId)
5156
}
5257

5358
override fun tick() {

‎common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/extendon/ExtendonBlockEntity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import org.valkyrienskies.clockwork.ClockworkItems
2323
import org.valkyrienskies.clockwork.ClockworkMod
2424
import org.valkyrienskies.clockwork.ClockworkModClient
2525
import org.valkyrienskies.clockwork.ClockworkSounds
26-
import org.valkyrienskies.clockwork.util.AerodynamicUtils
2726
import org.valkyrienskies.clockwork.util.KNodeBlockEntity
2827
import org.valkyrienskies.clockwork.util.gtpa
2928
import org.valkyrienskies.clockwork.util.universal_joint.IUniversalJoint
@@ -41,6 +40,7 @@ import org.valkyrienskies.mod.common.util.toJOMLD
4140
import java.util.EnumMap
4241
import org.valkyrienskies.kelvin.api.DuctNetwork.Companion.idealGasConstant
4342
import org.valkyrienskies.mod.common.dimensionId
43+
import org.valkyrienskies.mod.common.vsCore
4444
import kotlin.math.PI
4545
import kotlin.math.abs
4646
import kotlin.math.max
@@ -359,7 +359,7 @@ class ExtendonBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: Block
359359
var moles = 0.0
360360
for ((gas, mass) in network.getGasMassAt(pos)) moles += gas.massToMoles(mass)
361361

362-
val pressure = AerodynamicUtils.getAirPressureForY(pos.y, dimensionId)
362+
val pressure = vsCore.dummyShipWorldServer.aerodynamicUtils.getAirPressureForY(pos.y, dimensionId)
363363
val temperature = network.getTemperatureAt(pos)
364364

365365
val volume = temperature*idealGasConstant*moles/pressure

‎common/src/main/kotlin/org/valkyrienskies/clockwork/content/physicalities/gas_thruster/GasThrusterBlockEntity.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties
1111
import org.valkyrienskies.clockwork.ClockworkConfig
1212
import org.valkyrienskies.clockwork.ClockworkMod
1313
import org.valkyrienskies.clockwork.ClockworkSoundScapes
14-
import org.valkyrienskies.clockwork.util.AerodynamicUtils
14+
import org.valkyrienskies.clockwork.util.ClockworkConstants
1515
import org.valkyrienskies.clockwork.util.KNodeBlockEntity
1616
import org.valkyrienskies.core.api.ships.PhysShip
17+
import org.valkyrienskies.core.api.util.AerodynamicUtils
1718
import org.valkyrienskies.core.api.util.PhysTickOnly
1819
import org.valkyrienskies.core.api.world.PhysLevel
1920
import org.valkyrienskies.core.api.world.properties.DimensionId
@@ -23,8 +24,9 @@ import org.valkyrienskies.kelvin.api.GasType
2324
import org.valkyrienskies.kelvin.impl.registry.GasTypeRegistry
2425
import org.valkyrienskies.kelvin.util.KelvinExtensions.toDuctNodePos
2526
import org.valkyrienskies.mod.api.BlockEntityPhysicsListener
26-
import org.valkyrienskies.mod.common.dimensionId
27+
import org.valkyrienskies.mod.api.dimensionId
2728
import org.valkyrienskies.mod.common.util.toJOMLD
29+
import org.valkyrienskies.mod.common.vsCore
2830
import kotlin.math.*
2931
import kotlin.random.Random
3032

@@ -126,7 +128,7 @@ class GasThrusterBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: Bl
126128

127129
if (gasMasses.values.sum() == 0.0) return clearMassFlow()
128130

129-
val airPressure = AerodynamicUtils.getAirPressureForY(blockPos.y.toDouble(), level!!.dimensionId)
131+
val airPressure = vsCore.dummyShipWorldServer.aerodynamicUtils.getAirPressureForY(blockPos.y.toDouble(), level!!.dimensionId)
130132
val gasPressure = kelvin.getPressureAt(ductnodepos)
131133
val temp = kelvin.getTemperatureAt(ductnodepos)
132134
val avgSpecificHeat = kelvin.mixtureCapacity(kelvin.getGasMassAt(ductnodepos))
@@ -140,11 +142,11 @@ class GasThrusterBlockEntity(type: BlockEntityType<*>?, pos: BlockPos, state: Bl
140142
velocity += edge.currentFlowRate
141143
}
142144

143-
val maxFlowRate = (AerodynamicUtils.DUCT_AREA * gasPressure / sqrt(temp)) * sqrt(avgSpecificHeat/AerodynamicUtils.UNIVERSAL_GAS_CONSTANT) * ((avgSpecificHeat+1)/2).pow(-(avgSpecificHeat+1)/(2*(avgSpecificHeat-1)))
145+
val maxFlowRate = (ClockworkConstants.Misc.DUCT_AREA * gasPressure / sqrt(temp)) * sqrt(avgSpecificHeat/ AerodynamicUtils.UNIVERSAL_GAS_CONSTANT) * ((avgSpecificHeat+1)/2).pow(-(avgSpecificHeat+1)/(2*(avgSpecificHeat-1)))
144146
val flowRate = min(maxFlowRate, velocity)
145147

146148
for (gas in gasMasses) {
147-
velocity += flowRate/(gas.key.density*AerodynamicUtils.DUCT_AREA)
149+
velocity += flowRate/(gas.key.density*ClockworkConstants.Misc.DUCT_AREA)
148150

149151
val gasMassLoss = max(flowRate*0.05, gas.value)
150152

0 commit comments

Comments
 (0)