Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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")
}
}
}
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/lambda/mixin/render/GameRendererMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Void> original) {
original.call(instance, allocator, tickCounter, renderBlockOutline, camera, positionMatrix, basicProjectionMatrix, projectionMatrix, fogBuffer, fogColor, renderSky);
RenderMain.render();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/lambda/mixin/render/WorldRendererMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/lambda/sound/SoundHandler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ 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())
)
}

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

mc.soundManager.play(
PositionedSoundInstance.master(event, actualPitch.toFloat())
PositionedSoundInstance.ui(event, actualPitch.toFloat())
)
}

Expand Down