diff --git a/build.gradle.kts b/build.gradle.kts index 93334b3b6..7c40b6c2d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ val replacements = file("gradle.properties").inputStream().use { stream -> plugins { kotlin("jvm") version "2.3.0" id("org.jetbrains.dokka") version "2.1.0" - id("fabric-loom") version "1.16-SNAPSHOT" + id("fabric-loom") version "1.17-SNAPSHOT" id("com.gradleup.shadow") version "9.3.0" id("maven-publish") } @@ -110,18 +110,19 @@ loom { runs { all { - property("lambda.dev", "youtu.be/RYnFIRc0k6E") - - property("org.lwjgl.util.Debug", "true") - property("org.lwjgl.util.DebugLoader", "true") - //property("org.lwjgl.util.DebugAllocator", "true") - //property("org.lwjgl.util.DebugAllocator.fast", "true") - property("org.lwjgl.util.DebugStack", "true") - property("org.lwjgl.util.DebugFunctions", "true") - property("mixin.debug.export", "true") - - vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash") - programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****") + systemProperties.putAll(mapOf( + Pair("lambda.dev", "youtu.be/RYnFIRc0k6E"), + Pair("org.lwjgl.util.Debug", "true"), + Pair("org.lwjgl.util.DebugStack", "true"), + Pair("org.lwjgl.util.DebugFunctions", "true"), + Pair("mixin.debug.export", "true") + )) + +// //property("org.lwjgl.util.DebugAllocator", "true") +// //property("org.lwjgl.util.DebugAllocator.fast", "true") + + programArguments.addAll("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****") + jvmArguments.addAll("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash") } } } @@ -197,7 +198,7 @@ dependencies { modCompileOnly("maven.modrinth:litematica:$litematicaVersion") // DevLogin - modRuntimeOnly("com.ptsmods:devlogin:3.5") + //modRuntimeOnly("com.ptsmods:devlogin:3.5.1:fabric") // Test implementations testImplementation(kotlin("test")) @@ -240,14 +241,14 @@ kotlin { freeCompilerArgs.addAll("-Xcontext-parameters", "-Xconsistent-data-class-copy-visibility", "-Xannotation-default-target=param-property") } - jvmToolchain(21) + jvmToolchain(25) } java { withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } publishing { diff --git a/gradle.properties b/gradle.properties index 71b45c1cf..d926a5ad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ lwjglVersion=3.3.3 mixinExtrasVersion=0.5.0 kotlinVersion=2.3.0 pngEncoderVersion=0.16.0 -javaVersion=21 +javaVersion=25 baritoneVersion=1.14.0 discordIPCVersion=6f6b6cce17 classGraphVersion=4.8.184 @@ -40,9 +40,9 @@ mockkVersion=1.14.7 spairVersion=1.90.0 # Fabric https://fabricmc.net/develop/ -fabricLoaderVersion=0.18.3 -yarnMappings=build.3 -fabricApiVersion=0.139.5 +fabricLoaderVersion=0.19.5 +yarnMappings=build.6 +fabricApiVersion=0.141.6 kotlinFabricVersion=1.13.8+kotlin sodiumVersion=mc1.21.11-0.8.7-fabric litematicaVersion=0.26.11 diff --git a/src/main/java/com/lambda/mixin/render/GameRendererMixin.java b/src/main/java/com/lambda/mixin/render/GameRendererMixin.java index ec80d7db3..bc9bc9023 100644 --- a/src/main/java/com/lambda/mixin/render/GameRendererMixin.java +++ b/src/main/java/com/lambda/mixin/render/GameRendererMixin.java @@ -40,8 +40,8 @@ import net.minecraft.client.render.RenderTickCounter; import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl; -import net.minecraft.client.util.ObjectAllocator; import net.minecraft.client.util.Window; +import net.minecraft.client.util.memory.ObjectAllocator; import net.minecraft.item.ItemStack; import org.joml.Matrix4f; import org.joml.Vector4f; @@ -61,7 +61,7 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) { } } - @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V")) + @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/memory/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V")) void onRenderWorld(WorldRenderer instance, ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, Matrix4f positionMatrix, Matrix4f basicProjectionMatrix, Matrix4f projectionMatrix, GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, Operation original) { original.call(instance, allocator, tickCounter, renderBlockOutline, camera, positionMatrix, basicProjectionMatrix, projectionMatrix, fogBuffer, fogColor, renderSky); RenderMain.render(); diff --git a/src/main/java/com/lambda/mixin/render/WorldRendererMixin.java b/src/main/java/com/lambda/mixin/render/WorldRendererMixin.java index 95a66dc3f..a8d732bb6 100644 --- a/src/main/java/com/lambda/mixin/render/WorldRendererMixin.java +++ b/src/main/java/com/lambda/mixin/render/WorldRendererMixin.java @@ -37,7 +37,7 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderManager; import net.minecraft.client.render.block.entity.state.BlockEntityRenderState; import net.minecraft.client.render.state.WorldRenderState; -import net.minecraft.client.util.ObjectAllocator; +import net.minecraft.client.util.memory.ObjectAllocator; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -72,8 +72,8 @@ public abstract class WorldRendererMixin { @Inject(method = "render", at = @At("HEAD")) private void onRender(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, - Camera camera, Matrix4f positionMatrix, Matrix4f basicProjectionMatrix, Matrix4f projectionMatrix, - GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo ci) { + Camera camera, Matrix4f positionMatrix, Matrix4f basicProjectionMatrix, Matrix4f projectionMatrix, + GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo ci) { RenderMain.updateState(positionMatrix, basicProjectionMatrix, projectionMatrix); EventFlow.post(RenderEvent.PreRenderWorld.INSTANCE); } diff --git a/src/main/kotlin/com/lambda/sound/SoundHandler.kt b/src/main/kotlin/com/lambda/sound/SoundHandler.kt index 1125a5061..75ae5d46e 100644 --- a/src/main/kotlin/com/lambda/sound/SoundHandler.kt +++ b/src/main/kotlin/com/lambda/sound/SoundHandler.kt @@ -29,7 +29,7 @@ import net.minecraft.sound.SoundEvent object SoundHandler : Loadable { fun playSound(event: SoundEvent, pitch: Double = 1.0) { mc.soundManager.play( - PositionedSoundInstance.master(event, pitch.toFloat()) + PositionedSoundInstance.ui(event, pitch.toFloat()) ) } @@ -37,7 +37,7 @@ object SoundHandler : Loadable { val actualPitch = (pitch - pitchRange..pitch + pitchRange).random() mc.soundManager.play( - PositionedSoundInstance.master(event, actualPitch.toFloat()) + PositionedSoundInstance.ui(event, actualPitch.toFloat()) ) }