Skip to content

Commit 7c0adc4

Browse files
authored
Update Fabric, FabricAPI, Yarn, Loom, and Java versions and commented out devauth (#345)
1 parent a07d7ac commit 7c0adc4

5 files changed

Lines changed: 29 additions & 28 deletions

File tree

‎build.gradle.kts‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ val replacements = file("gradle.properties").inputStream().use { stream ->
4747
plugins {
4848
kotlin("jvm") version "2.3.0"
4949
id("org.jetbrains.dokka") version "2.1.0"
50-
id("fabric-loom") version "1.16-SNAPSHOT"
50+
id("fabric-loom") version "1.17-SNAPSHOT"
5151
id("com.gradleup.shadow") version "9.3.0"
5252
id("maven-publish")
5353
}
@@ -110,18 +110,19 @@ loom {
110110

111111
runs {
112112
all {
113-
property("lambda.dev", "youtu.be/RYnFIRc0k6E")
114-
115-
property("org.lwjgl.util.Debug", "true")
116-
property("org.lwjgl.util.DebugLoader", "true")
117-
//property("org.lwjgl.util.DebugAllocator", "true")
118-
//property("org.lwjgl.util.DebugAllocator.fast", "true")
119-
property("org.lwjgl.util.DebugStack", "true")
120-
property("org.lwjgl.util.DebugFunctions", "true")
121-
property("mixin.debug.export", "true")
122-
123-
vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash")
124-
programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
113+
systemProperties.putAll(mapOf(
114+
Pair("lambda.dev", "youtu.be/RYnFIRc0k6E"),
115+
Pair("org.lwjgl.util.Debug", "true"),
116+
Pair("org.lwjgl.util.DebugStack", "true"),
117+
Pair("org.lwjgl.util.DebugFunctions", "true"),
118+
Pair("mixin.debug.export", "true")
119+
))
120+
121+
// //property("org.lwjgl.util.DebugAllocator", "true")
122+
// //property("org.lwjgl.util.DebugAllocator.fast", "true")
123+
124+
programArguments.addAll("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
125+
jvmArguments.addAll("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash")
125126
}
126127
}
127128
}
@@ -197,7 +198,7 @@ dependencies {
197198
modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
198199

199200
// DevLogin
200-
modRuntimeOnly("com.ptsmods:devlogin:3.5")
201+
//modRuntimeOnly("com.ptsmods:devlogin:3.5.1:fabric")
201202

202203
// Test implementations
203204
testImplementation(kotlin("test"))
@@ -240,14 +241,14 @@ kotlin {
240241
freeCompilerArgs.addAll("-Xcontext-parameters", "-Xconsistent-data-class-copy-visibility", "-Xannotation-default-target=param-property")
241242
}
242243

243-
jvmToolchain(21)
244+
jvmToolchain(25)
244245
}
245246

246247
java {
247248
withSourcesJar()
248249

249-
sourceCompatibility = JavaVersion.VERSION_21
250-
targetCompatibility = JavaVersion.VERSION_21
250+
sourceCompatibility = JavaVersion.VERSION_25
251+
targetCompatibility = JavaVersion.VERSION_25
251252
}
252253

253254
publishing {

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ lwjglVersion=3.3.3
3030
mixinExtrasVersion=0.5.0
3131
kotlinVersion=2.3.0
3232
pngEncoderVersion=0.16.0
33-
javaVersion=21
33+
javaVersion=25
3434
baritoneVersion=1.14.0
3535
discordIPCVersion=6f6b6cce17
3636
classGraphVersion=4.8.184
@@ -40,9 +40,9 @@ mockkVersion=1.14.7
4040
spairVersion=1.90.0
4141

4242
# Fabric https://fabricmc.net/develop/
43-
fabricLoaderVersion=0.18.3
44-
yarnMappings=build.3
45-
fabricApiVersion=0.139.5
43+
fabricLoaderVersion=0.19.5
44+
yarnMappings=build.6
45+
fabricApiVersion=0.141.6
4646
kotlinFabricVersion=1.13.8+kotlin
4747
sodiumVersion=mc1.21.11-0.8.7-fabric
4848
litematicaVersion=0.26.11

‎src/main/java/com/lambda/mixin/render/GameRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import net.minecraft.client.render.RenderTickCounter;
4141
import net.minecraft.client.render.WorldRenderer;
4242
import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
43-
import net.minecraft.client.util.ObjectAllocator;
4443
import net.minecraft.client.util.Window;
44+
import net.minecraft.client.util.memory.ObjectAllocator;
4545
import net.minecraft.item.ItemStack;
4646
import org.joml.Matrix4f;
4747
import org.joml.Vector4f;
@@ -61,7 +61,7 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
6161
}
6262
}
6363

64-
@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"))
64+
@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"))
6565
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<Void> original) {
6666
original.call(instance, allocator, tickCounter, renderBlockOutline, camera, positionMatrix, basicProjectionMatrix, projectionMatrix, fogBuffer, fogColor, renderSky);
6767
RenderMain.render();

‎src/main/java/com/lambda/mixin/render/WorldRendererMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import net.minecraft.client.render.block.entity.BlockEntityRenderManager;
3838
import net.minecraft.client.render.block.entity.state.BlockEntityRenderState;
3939
import net.minecraft.client.render.state.WorldRenderState;
40-
import net.minecraft.client.util.ObjectAllocator;
40+
import net.minecraft.client.util.memory.ObjectAllocator;
4141
import net.minecraft.client.world.ClientWorld;
4242
import net.minecraft.entity.Entity;
4343
import net.minecraft.entity.LivingEntity;
@@ -72,8 +72,8 @@ public abstract class WorldRendererMixin {
7272

7373
@Inject(method = "render", at = @At("HEAD"))
7474
private void onRender(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline,
75-
Camera camera, Matrix4f positionMatrix, Matrix4f basicProjectionMatrix, Matrix4f projectionMatrix,
76-
GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo ci) {
75+
Camera camera, Matrix4f positionMatrix, Matrix4f basicProjectionMatrix, Matrix4f projectionMatrix,
76+
GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo ci) {
7777
RenderMain.updateState(positionMatrix, basicProjectionMatrix, projectionMatrix);
7878
EventFlow.post(RenderEvent.PreRenderWorld.INSTANCE);
7979
}

‎src/main/kotlin/com/lambda/sound/SoundHandler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ import net.minecraft.sound.SoundEvent
2929
object SoundHandler : Loadable {
3030
fun playSound(event: SoundEvent, pitch: Double = 1.0) {
3131
mc.soundManager.play(
32-
PositionedSoundInstance.master(event, pitch.toFloat())
32+
PositionedSoundInstance.ui(event, pitch.toFloat())
3333
)
3434
}
3535

3636
fun playSoundRandomly(event: SoundEvent, pitch: Double = 1.0, pitchRange: Double = 0.05) {
3737
val actualPitch = (pitch - pitchRange..pitch + pitchRange).random()
3838

3939
mc.soundManager.play(
40-
PositionedSoundInstance.master(event, actualPitch.toFloat())
40+
PositionedSoundInstance.ui(event, actualPitch.toFloat())
4141
)
4242
}
4343

0 commit comments

Comments
 (0)