Fixed java interop

Author: emyfops

common/src/main/kotlin/com/lambda/graphics/RenderMain.kt

@@ -34,7 +34,7 @@ import org.joml.Matrix4f
 object RenderMain {
     val projectionMatrix = Matrix4f()
     val modelViewMatrix get() = Matrices.peek()
-    val projModel get() = Matrix4f(projectionMatrix).mul(modelViewMatrix)
+    val projModel: Matrix4f get() = Matrix4f(projectionMatrix).mul(modelViewMatrix)
 
     var screenSize = Vec2d.ZERO
     var scaleFactor = 1.0

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -456,19 +456,20 @@ object BuildSimulator {
             )
 
             /* player has a better tool for the job available */
-            if (!player.isCreative) findBestAvailableTool(state)?.let { bestTool ->
-                Hand.entries.firstOrNull {
-                    val stack = player.getStackInHand(it)
-                    stack.item == bestTool
-                }?.let { hand ->
-                    breakContext.hand = hand
-                    acc.add(BreakResult.Break(pos, breakContext))
-                    return acc
-                } ?: run {
-                    acc.add(BuildResult.WrongItem(pos, breakContext, bestTool, player.activeItem, inventory))
-                    return acc
+            if (!player.isCreative) findBestAvailableTool(state)
+                ?.let { bestTool ->
+                    Hand.entries.firstOrNull {
+                        val stack = player.getStackInHand(it)
+                        stack.item == bestTool
+                    }?.let { hand ->
+                        breakContext.hand = hand
+                        acc.add(BreakResult.Break(pos, breakContext))
+                        return acc
+                    } ?: run {
+                        acc.add(BuildResult.WrongItem(pos, breakContext, bestTool, player.activeItem, inventory))
+                        return acc
+                    }
                 }
-            }
 
             acc.add(BreakResult.Break(pos, breakContext))
         }

common/src/main/kotlin/com/lambda/module/modules/client/Network.kt

@@ -55,7 +55,8 @@ object Network : Module(
     val mappings by setting("Mappings", "https://mappings.lambda-client.org")
     val cdn by setting("CDN", "https://cdn.lambda-client.org")
 
-    val gameVersion = SharedConstants.getGameVersion().name
+    @Suppress("Deprecation")
+    const val GAME_VERSION = SharedConstants.VERSION_NAME
 
     private var hash: String? = null
 

common/src/main/kotlin/com/lambda/util/DynamicReflectionSerializer.kt

@@ -76,8 +76,8 @@ object DynamicReflectionSerializer : Loadable {
     private const val INDENT = 2
 
     private val mappings = runBlocking {
-        "${Network.mappings}/${Network.gameVersion}"
-            .downloadIfNotPresent(cache.resolveFile(Network.gameVersion))
+        "${Network.mappings}/${Network.GAME_VERSION}"
+            .downloadIfNotPresent(cache.resolveFile(Network.GAME_VERSION))
             .map { file ->
                 val standardMappings = file.readLines()
                     .map { it.split(' ') }

common/src/main/kotlin/com/lambda/util/extension/World.kt

@@ -28,6 +28,7 @@ import net.minecraft.block.Blocks
 import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.shape.VoxelShape
 import net.minecraft.world.World
 import java.awt.Color
 
@@ -43,10 +44,10 @@ val World?.dimensionName: String
         else -> "Unknown"
     }
 
-fun SafeContext.collisionShape(state: BlockState, pos: BlockPos) =
+fun SafeContext.collisionShape(state: BlockState, pos: BlockPos): VoxelShape =
     state.getCollisionShape(world, pos).offset(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble())
 
-fun SafeContext.outlineShape(state: BlockState, pos: BlockPos) =
+fun SafeContext.outlineShape(state: BlockState, pos: BlockPos): VoxelShape =
     state.getOutlineShape(world, pos).offset(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble())
 
 fun SafeContext.blockColor(state: BlockState, pos: BlockPos) =

common/src/main/kotlin/com/lambda/util/player/MovementUtils.kt

@@ -146,7 +146,7 @@ object MovementUtils {
     fun SafeContext.movementVector(radDir: Double = calcMoveRad(), y: Double = 0.0) =
         Vec3d(-sin(radDir), y, cos(radDir))
 
-    var Entity.motion
+    var Entity.motion: Vec3d
         get() = velocity
         set(value) {
             velocity = value