Merge branch '1.19.2/main' into 1.20.1/main

Author: millennIumAMbiguity

build.gradle

@@ -18,9 +18,12 @@ if (project.hasProperty("CustomReleaseVersion")) {
     // Remove release/ from the version if present
     version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
 } else {
-    String gitRevision = "git rev-parse HEAD".execute().text.trim()
-
-    version = eureka_version + '+' + gitRevision.substring(0, 10)
+    try {
+        String gitRevision = "git rev-parse HEAD".execute().text.trim()
+        version = eureka_version + '+' + gitRevision.substring(0, 10)
+    } catch (Exception e) {
+        version = eureka_version
+    }
 }
 
 architectury {
@@ -86,6 +89,10 @@ subprojects {
             reporter "checkstyle"
         }
     }
+
+    kotlin {
+        jvmToolchain(17)
+    }
 }
 
 allprojects {
@@ -124,4 +131,4 @@ allprojects {
     java {
         withSourcesJar()
     }
-}
+}

changelogs/1.5.0-beta.1.md

@@ -0,0 +1,18 @@
+# Additions
+  * Added hip name/slug and speed to the helm UI.
+  * Added support for item extraction from the engine.
+  * Added config `linearBaseMass`
+  * Added config `linearMassScaling`
+  * Added config `linearMaxMass`
+  * Added config `linearMaxSpeed`
+# Changes
+  * Descending speed is now constant.
+  * Update Russian translation.
+  * Optimized textures.
+  * Updated the input acceleration system to scale with mass.
+  * Disable the align button in the helm UI when ship is disassembled.
+# Fixes
+  * Fixed so that ships can no longer accumulate momentum while anchored.
+  * Fixed orientation changes on disassembly.
+  * Fixed an issue where explosions do not affect ship buoyancy.
+  * Fixed side drift when ascending and descending.

common/src/main/kotlin/org/valkyrienskies/eureka/EurekaConfig.kt

@@ -14,7 +14,7 @@ object EurekaConfig {
     class Server {
 
         @JsonSchema(description = "Movement power per engine when heated fully")
-        val enginePowerLinear: Float = 2000000f
+        val enginePowerLinear: Float = 500000f
 
         @JsonSchema(description = "Movement power per engine with minimal heat")
         val enginePowerLinearMin: Float = 10000f
@@ -64,9 +64,12 @@ object EurekaConfig {
 
         // Sensitivity of the up/down impulse buttons.
         // TODO maybe should be moved to VS2 client-side config?
-        @JsonSchema(description = "Vertical sensitivity up ascend/descend")
+        @JsonSchema(description = "Vertical sensitivity when ascending")
         var baseImpulseElevationRate = 2.0
 
+        @JsonSchema(description = "Vertical sensitivity when descending")
+        var baseImpulseDescendRate = 4.0
+
         @JsonSchema(description = "The max elevation speed boost gained by having extra extra balloons")
         var balloonElevationMaxSpeed = 5.5
 
@@ -105,6 +108,20 @@ object EurekaConfig {
         @JsonSchema(description = "How fast a ship will stop. 1 = fast stop, 0 = slow stop")
         var linearStabilizeMaxAntiVelocity = 1.0
 
+        @JsonSchema(description = "How fast a ship will stop and accelerate.")
+        var linearMassScaling = 0.0002
+
+        // Must be positive. higher value will case slower acceleration and deceleration.
+        @JsonSchema(description = "Base mass for linear acceleration in Kg.")
+        var linearBaseMass = 50.0
+
+        //when value is same as linearMaxMass, actual value will be 1/3. actual value will be close to linearMaxMass when 5 times over
+        @JsonSchema(description = "Max smoothing value, will smooth out before reaching max value.")
+        var linearMaxMass = 10000.0
+
+        @JsonSchema(description = "Max unscaled speed in m/s.")
+        var linearMaxSpeed = 15.0
+
         // Anti-velocity mass relevance when stopping the ship
         // Max 10.0 (means no mass irrelevance)
         @JsonSchema(description = "How much inertia affects Eureka ships. Max 10 = full inertia")

common/src/main/kotlin/org/valkyrienskies/eureka/block/AnchorBlock.kt

@@ -91,8 +91,9 @@ class AnchorBlock :
         attachment.anchorsActive += if (bl) 1 else 0
     }
 
-    override fun destroy(level: LevelAccessor, pos: BlockPos, state: BlockState) {
-        super.destroy(level, pos, state)
+    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, isMoving: Boolean) {
+        super.onRemove(state, level, pos, newState, isMoving)
+
         if (level.isClientSide) return
         level as ServerLevel
 

common/src/main/kotlin/org/valkyrienskies/eureka/block/BalloonBlock.kt

@@ -33,8 +33,8 @@ class BalloonBlock(properties: Properties) : Block(properties) {
         EurekaShipControl.getOrCreate(ship).balloons += 1
     }
 
-    override fun destroy(level: LevelAccessor, pos: BlockPos, state: BlockState) {
-        super.destroy(level, pos, state)
+    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, isMoving: Boolean) {
+        super.onRemove(state, level, pos, newState, isMoving)
 
         if (level.isClientSide) return
         level as ServerLevel

common/src/main/kotlin/org/valkyrienskies/eureka/block/FloaterBlock.kt

@@ -62,8 +62,8 @@ class FloaterBlock : Block(
         level.setBlock(pos, state.setValue(POWER, signal), 2)
     }
 
-    override fun destroy(level: LevelAccessor, pos: BlockPos, state: BlockState) {
-        super.destroy(level, pos, state)
+    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, isMoving: Boolean) {
+        super.onRemove(state, level, pos, newState, isMoving)
 
         if (level.isClientSide) return
         level as ServerLevel

common/src/main/kotlin/org/valkyrienskies/eureka/block/ShipHelmBlock.kt

@@ -55,8 +55,8 @@ class ShipHelmBlock(properties: Properties, val woodType: WoodType) : BaseEntity
         EurekaShipControl.getOrCreate(ship).helms += 1
     }
 
-    override fun destroy(level: LevelAccessor, pos: BlockPos, state: BlockState) {
-        super.destroy(level, pos, state)
+    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, isMoving: Boolean) {
+        super.onRemove(state, level, pos, newState, isMoving)
 
         if (level.isClientSide) return
         level as ServerLevel

common/src/main/kotlin/org/valkyrienskies/eureka/blockentity/EngineBlockEntity.kt

@@ -215,13 +215,14 @@ class EngineBlockEntity(pos: BlockPos, state: BlockState) :
         ) <= 64.0
     }
 
-    override fun getSlotsForFace(side: Direction): IntArray =
-        if (side == Direction.DOWN) intArrayOf() else intArrayOf(0)
+    override fun getSlotsForFace(side: Direction): IntArray = intArrayOf(0)
 
     override fun canPlaceItemThroughFace(index: Int, itemStack: ItemStack, direction: Direction?): Boolean =
         direction != Direction.DOWN && canPlaceItem(index, itemStack)
 
-    override fun canTakeItemThroughFace(index: Int, stack: ItemStack, direction: Direction): Boolean = false
+    override fun canTakeItemThroughFace(index: Int, stack: ItemStack, direction: Direction): Boolean =
+        // Allow extraction from slot 0 (fuel slot) when the hopper is below the block entity
+        index == 0 && direction == Direction.DOWN && !fuel.isEmpty && !AbstractFurnaceBlockEntity.isFuel(fuel)
 
     override fun canPlaceItem(index: Int, stack: ItemStack): Boolean =
         index == 0 && AbstractFurnaceBlockEntity.isFuel(stack)

common/src/main/kotlin/org/valkyrienskies/eureka/gui/shiphelm/ShipHelmScreen.kt

@@ -9,6 +9,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.phys.BlockHitResult
+import org.valkyrienskies.core.api.ships.Ship
 import org.valkyrienskies.eureka.EurekaConfig
 import org.valkyrienskies.eureka.EurekaMod
 import org.valkyrienskies.mod.common.getShipManagingPos
@@ -20,10 +21,12 @@ class ShipHelmScreen(handler: ShipHelmScreenMenu, playerInventory: Inventory, te
     private lateinit var alignButton: ShipHelmButton
     private lateinit var disassembleButton: ShipHelmButton
 
-    private val pos = (Minecraft.getInstance().hitResult as? BlockHitResult)?.blockPos
+    private var pos = (Minecraft.getInstance().hitResult as? BlockHitResult)?.blockPos
+    private var ship: Ship? = pos?.let { Minecraft.getInstance().level?.getShipManagingPos(it) }
 
     init {
-        titleLabelX = 120
+        titleLabelX = 6
+        titleLabelY = 6
     }
 
     override fun init() {
@@ -54,10 +57,14 @@ class ShipHelmScreen(handler: ShipHelmScreenMenu, playerInventory: Inventory, te
     }
 
     private fun updateButtons() {
-        val level = Minecraft.getInstance().level ?: return
-        val isLookingAtShip = level.getShipManagingPos(pos ?: return) != null
+        pos = (Minecraft.getInstance().hitResult as? BlockHitResult)?.blockPos
+        ship = pos?.let { Minecraft.getInstance().level?.getShipManagingPos(it) }
+
+        val isLookingAtShip = ship != null
+
         assembleButton.active = !isLookingAtShip
         disassembleButton.active = EurekaConfig.SERVER.allowDisassembly && isLookingAtShip
+        alignButton.active = disassembleButton.active
     }
 
     override fun renderBg(guiGraphics: GuiGraphics, partialTicks: Float, mouseX: Int, mouseY: Int) {
@@ -72,8 +79,6 @@ class ShipHelmScreen(handler: ShipHelmScreenMenu, playerInventory: Inventory, te
     }
 
     override fun renderLabels(guiGraphics: GuiGraphics, i: Int, j: Int) {
-        guiGraphics.drawString(font, title, titleLabelX, titleLabelY, 0x404040, false)
-
         if (this.menu.aligning) {
             alignButton.message = ALIGNING_TEXT
             alignButton.active = false
@@ -83,6 +88,9 @@ class ShipHelmScreen(handler: ShipHelmScreenMenu, playerInventory: Inventory, te
         }
 
         // TODO render stats
+        if (ship == null) return
+        ship!!.slug?.let { guiGraphics.drawString(font, it, titleLabelX, titleLabelY, 0x404040, false) }
+        guiGraphics.drawString(font, String.format("%.2f", ship!!.velocity.length()) + "m/s", 8, 25, 0x404040, false)
     }
 
     // mojank doesn't check mouse release for their widgets for some reason