consume air per second, not per tick

Author: PssbleTrngle

src/main/kotlin/com/possible_triangle/create_jetpack/config/ServerConfig.kt

@@ -6,8 +6,8 @@ import net.minecraft.world.item.enchantment.Enchantment
 import net.neoforged.neoforge.common.ModConfigSpec
 
 interface IServerConfig {
-    val usesPerTank: Int
-    val usesPerTankHover: Int
+    val secondsPerTank: Int
+    val secondsPerTankHover: Int
     val horizontalSpeed: Double
     val verticalSpeed: Double
     val acceleration: Double
@@ -18,8 +18,8 @@ interface IServerConfig {
 }
 
 data class SyncedConfig(
-    override val usesPerTank: Int,
-    override val usesPerTankHover: Int,
+    override val secondsPerTank: Int,
+    override val secondsPerTankHover: Int,
     override val horizontalSpeed: Double,
     override val verticalSpeed: Double,
     override val acceleration: Double,
@@ -32,12 +32,12 @@ data class SyncedConfig(
 
 class ServerConfig(builder: ModConfigSpec.Builder) : IServerConfig {
 
-    private val usesPerTankValue = builder.defineInRange("air.uses_per_tank", 2048, 1, Integer.MAX_VALUE)
-    override val usesPerTank get() = usesPerTankValue.get()
+    private val secondsPerTankValue = builder.defineInRange("air.seconds_per_tank", 450, 1, Integer.MAX_VALUE)
+    override val secondsPerTank get() = secondsPerTankValue.get()
 
-    private val usesPerTankHoverValue =
-        builder.defineInRange("air.uses_per_tank_hover", 2048 * 10, 1, Integer.MAX_VALUE)
-    override val usesPerTankHover get() = usesPerTankHoverValue.get()
+    private val secondsPerTankHoverValue =
+        builder.defineInRange("air.seconds_per_tank_hover", 900, 1, Integer.MAX_VALUE)
+    override val secondsPerTankHover get() = secondsPerTankHoverValue.get()
 
     private val horizontalSpeedValue = builder.defineInRange("speed.horizontal", 0.02, 0.01, 100.0)
     override val horizontalSpeed get() = horizontalSpeedValue.get()

src/main/kotlin/com/possible_triangle/create_jetpack/config/SyncConfigMessage.kt

@@ -19,8 +19,8 @@ class SyncConfigMessage(private val config: IServerConfig) : CustomPacketPayload
 
         private fun decode(buf: FriendlyByteBuf): SyncConfigMessage {
             val config = SyncedConfig(
-                usesPerTank = buf.readInt(),
-                usesPerTankHover = buf.readInt(),
+                secondsPerTank = buf.readInt(),
+                secondsPerTankHover = buf.readInt(),
                 horizontalSpeed = buf.readDouble(),
                 verticalSpeed = buf.readDouble(),
                 acceleration = buf.readDouble(),
@@ -32,8 +32,8 @@ class SyncConfigMessage(private val config: IServerConfig) : CustomPacketPayload
         }
 
         private fun encode(buf: FriendlyByteBuf, message: SyncConfigMessage) = with(message) {
-            buf.writeInt(config.usesPerTank)
-            buf.writeInt(config.usesPerTankHover)
+            buf.writeInt(config.secondsPerTank)
+            buf.writeInt(config.secondsPerTankHover)
             buf.writeDouble(config.horizontalSpeed)
             buf.writeDouble(config.verticalSpeed)
             buf.writeDouble(config.acceleration)

src/main/kotlin/com/possible_triangle/create_jetpack/item/JetpackItem.kt

@@ -75,12 +75,13 @@ open class JetpackItem(
     override fun getThrusters(context: Context) = thrusters
 
     override fun onUse(context: Context) {
-        BacktankUtil.canAbsorbDamage(context.entity, usesPerTank(context))
+        if (context.world.gameTime % 20 != 0L) return
+        BacktankUtil.canAbsorbDamage(context.entity, secondsPerTank(context))
     }
 
-    private fun usesPerTank(context: Context): Int {
-        return if (isHovering(context)) Configs.SERVER.usesPerTankHover
-        else Configs.SERVER.usesPerTank
+    private fun secondsPerTank(context: Context): Int {
+        return if (isHovering(context)) Configs.SERVER.secondsPerTankHover
+        else Configs.SERVER.secondsPerTank
     }
 
     override fun isValid(context: Context): Boolean {
@@ -94,7 +95,7 @@ open class JetpackItem(
     override fun isUsable(context: Context): Boolean {
         val tank = BacktankUtil.getAllWithAir(context.entity).firstOrNull() ?: return false
         val air = BacktankUtil.getAir(tank)
-        val cost = BacktankUtil.maxAirWithoutEnchants().toFloat() / usesPerTank(context)
+        val cost = BacktankUtil.maxAirWithoutEnchants().toFloat() / secondsPerTank(context)
         return air >= cost
     }