Merge branch 'master' into feature/taskflow

Author: Avanatiker

.gitignore

@@ -1,5 +1,50 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
 .idea/
-.gradle/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
 
-build/
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+### Minecraft ###
 run/
+logs/
+
+### Architectury ###
+.architectury-transformer/

build.gradle.kts

@@ -1,22 +1,25 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.task.RemapJarTask
+import java.util.*
 
-val modId = property("mod_id").toString()
-val modVersion = property("mod_version").toString()
-val mavenGroup = property("maven_group").toString()
-val minecraftVersion = property("minecraft_version").toString()
-val yarnMappings = property("yarn_mappings").toString()
+val targets = listOf("META-INF/*.toml", "fabric.mod.json")
+val replacements = file("gradle.properties").inputStream().use { stream ->
+    Properties().apply { load(stream) }
+}.map { (k, v) -> k.toString() to v.toString() }.toMap()
+
+val modId: String by project
+val modVersion: String by project
+val mavenGroup: String by project
+val minecraftVersion: String by project
+val yarnMappings: String by project
 
 val libs = file("libs")
-val Project.loom: LoomGradleExtensionAPI
-    get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
 
 plugins {
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "1.9.24"
     id("org.jetbrains.dokka") version "1.9.20"
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.5-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.6-SNAPSHOT" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
 }
 
@@ -30,18 +33,15 @@ subprojects {
 
     dependencies {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
-        "mappings"("net.fabricmc:yarn:$yarnMappings:v2")
-    }
-
-    repositories {
-        maven("https://babbaj.github.io/maven/")
+        "mappings"("net.fabricmc:yarn:$minecraftVersion+$yarnMappings:v2")
     }
 
     if (path == ":common") return@subprojects
 
     apply(plugin = "com.github.johnrengelman.shadow")
 
     val versionWithMCVersion = "$modVersion+$minecraftVersion"
+
     tasks {
         val shadowCommon by configurations.creating {
             isCanBeConsumed = false
@@ -64,6 +64,13 @@ subprojects {
         jar {
             enabled = false
         }
+
+        processResources {
+            // Replaces placeholders in the mod info files
+            filesMatching(targets) {
+                expand(replacements)
+            }
+        }
     }
 }
 
@@ -73,25 +80,26 @@ allprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
-    base.archivesName.set(modId)
     group = mavenGroup
     version = modVersion
 
+    base.archivesName = modId
+
     repositories {
         maven("https://api.modrinth.com/maven")
         maven("https://jitpack.io")
         maven("https://maven.shedaniel.me/") { name = "Architectury" }
         maven("https://maven.terraformersmc.com/releases/")
+        maven("https://babbaj.github.io/maven/")
 
+        // Allow the use of local libraries
         flatDir {
             dirs(libs)
         }
     }
 
     java {
-        // Uncomment these lines when the plugin system is ready
-        // withSourcesJar()
-        // withJavadocJar()
+        withSourcesJar()
 
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17

common/build.gradle.kts

@@ -1,15 +1,13 @@
-import java.util.Properties
+val modId: String by project
+val fabricLoaderVersion: String by project
+val kotlinVersion: String by project
+val kotlinxCoroutinesVersion: String by project
 
-val fabricLoaderVersion = property("fabric_loader_version").toString()
-val mixinExtrasVersion = property("mixinextras_version").toString()
-val kotlinVersion = property("kotlin_version").toString()
-val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
-
-architectury { common("fabric", "forge", "neoforge", "quilt") }
+architectury { common("fabric", "forge", "neoforge") }
 
 loom {
     silentMojangMappingsLicense()
-    accessWidenerPath.set(File("src/main/resources/lambda.accesswidener"))
+    accessWidenerPath = File("src/main/resources/$modId.accesswidener")
 }
 
 repositories {
@@ -26,23 +24,9 @@ dependencies {
 
     // Add Kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    implementation(kotlin("reflect"))
 
     // Baritone
     modImplementation("baritone-api:baritone-api:1.10.2")
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
 }
-
-tasks {
-    remapJar {
-        enabled = false
-    }
-
-    processResources {
-        Properties().apply {
-            load(project.rootProject.file("gradle.properties").inputStream())
-        }.forEach { key, value ->
-            inputs.property(key.toString(), value)
-        }
-    }
-}
-

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -61,6 +61,11 @@ void processMovement(Input input, boolean slowDown, float slowDownFactor) {
         EventFlow.post(new MovementEvent.InputUpdate(input, slowDown, slowDownFactor));
     }
 
+    @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
+    boolean isSprinting(ClientPlayerEntity entity) {
+        return EventFlow.post(new MovementEvent.Sprint(entity.isSprinting())).getSprint();
+    }
+
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
     void sendBegin(CallbackInfo ci) {
         ci.cancel();

common/src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java

@@ -0,0 +1,23 @@
+package com.lambda.mixin.items;
+
+import com.lambda.module.modules.render.BlockESP;
+import net.minecraft.block.BarrierBlock;
+import net.minecraft.block.BlockRenderType;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BarrierBlock.class)
+public class BarrierBlockMixin {
+
+    @Inject(method = "getRenderType", at = @At(value = "RETURN"), cancellable = true)
+    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
+        if (BlockESP.INSTANCE.isEnabled()
+                && BlockESP.getBarrier()
+                && state.getBlock() == Blocks.BARRIER
+        ) cir.setReturnValue(BlockRenderType.MODEL);
+    }
+}

common/src/main/java/com/lambda/mixin/render/BlockRenderManagerMixin.java

@@ -0,0 +1,22 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.BlockESP;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.render.block.BlockRenderManager;
+import net.minecraft.client.render.model.BakedModel;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BlockRenderManager.class)
+public abstract class BlockRenderManagerMixin {
+    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
+    private void getModel(BlockState state, CallbackInfoReturnable<BakedModel> cir) {
+        if (BlockESP.INSTANCE.isEnabled()
+                && BlockESP.getBarrier()
+                && state.getBlock() == Blocks.BARRIER
+        ) cir.setReturnValue(BlockESP.getModel());
+    }
+}

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

@@ -2,7 +2,9 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
+import com.lambda.graphics.RenderMain;
 import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,4 +18,9 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
             info.cancel();
         }
     }
+
+    @Inject(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V", shift = At.Shift.AFTER))
+    private void onRenderWorld(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) {
+        RenderMain.render3D(matrix.peek().getPositionMatrix());
+    }
 }

common/src/main/java/com/lambda/mixin/render/InGameOverlayRendererMixin.java

@@ -0,0 +1,51 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.InGameOverlayRenderer;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(InGameOverlayRenderer.class)
+public class InGameOverlayRendererMixin {
+    @Inject(method = "renderFireOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderFireOverlay(
+            MinecraftClient mc,
+            MatrixStack matrixStack,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoBurning()) ci.cancel();
+    }
+
+    @ModifyArg(method = "renderFireOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V"), index = 1)
+    private static float onRenderFireOverlayTranslate(float x) {
+        if (NoRender.INSTANCE.isEnabled()) {
+            return (float) NoRender.getFireOverlayYOffset();
+        } else {
+            return -0.3f;
+        }
+    }
+
+    @Inject(method = "renderUnderwaterOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderUnderwaterOverlay(
+            MinecraftClient mc,
+            MatrixStack matrixStack,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoUnderwater()) ci.cancel();
+    }
+
+    @Inject(method = "renderInWallOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderInWallOverlay(
+            Sprite sprite,
+            MatrixStack matrices,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoInWall()) ci.cancel();
+    }
+}

common/src/main/java/com/lambda/mixin/render/LightmapTextureManagerMixin.java

@@ -13,11 +13,11 @@
 @Mixin(LightmapTextureManager.class)
 public class LightmapTextureManagerMixin {
     @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"), index = 2)
-    private int updateModify(int x) {
+    private int updateModify(int color) {
         if (Fullbright.INSTANCE.isEnabled() || XRay.INSTANCE.isEnabled()) {
             return 0xFFFFFFFF;
         }
-        return x;
+        return color;
     }
 
     @Inject(method = "getDarknessFactor(F)F", at = @At("HEAD"), cancellable = true)

common/src/main/java/com/lambda/mixin/render/RenderLayersMixin.java

@@ -0,0 +1,20 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.XRay;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(RenderLayers.class)
+public class RenderLayersMixin {
+    @Inject(method = "getBlockLayer", at = @At("HEAD"), cancellable = true)
+    private static void onGetBlockLayer(BlockState state, CallbackInfoReturnable<RenderLayer> cir) {
+        if (XRay.INSTANCE.isDisabled()) return;
+
+        if (!XRay.isSelected(state)) cir.setReturnValue(RenderLayer.getTranslucent());
+    }
+}