Merge branch 'master' into feature/renderer

Author: emyfops

.github/workflows/add-label.yml

@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout your code
+      - name: Check Out Repository
         uses: actions/checkout@v3
       - name: Labeler
         uses: srvaroa/labeler@master

.github/workflows/build.yml

@@ -18,17 +18,17 @@ jobs:
     env:
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
     steps:
-      - name: Checkout Main
+      - name: Checkout Repository
         uses: actions/checkout@v4.1.1
 
       - name: Get Short Commit Hash
         id: vars
         run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
-      - name: Set up JDK
+      - name: Set-Up JDK 17
         uses: actions/setup-java@v4
         with:
-          distribution: 'oracle'
+          distribution: 'temurin'
           java-version: '17'
           architecture: x64
           cache: 'gradle'

.github/workflows/release.yml

@@ -18,17 +18,17 @@ jobs:
     env:
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
     steps:
-      - name: Checkout Main
+      - name: Checkout Repository
         uses: actions/checkout@v4.1.1
 
       - name: Get Short Commit Hash
         id: vars
         run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
-      - name: Set up JDK
+      - name: Set-Up JDK 17
         uses: actions/setup-java@v4
         with:
-          distribution: 'oracle'
+          distribution: 'temurin'
           java-version: '17'
           architecture: x64
           cache: 'gradle'
@@ -79,7 +79,7 @@ jobs:
               "pr_template": "- #{{TITLE}} [#{{AUTHOR}}](#{{URL}})"
             }
 
-      - name: Create release
+      - name: Create Release
         uses: softprops/action-gh-release@v2.0.8
         with:
           name: Lambda ${{ github.ref_name }}

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

@@ -0,0 +1,26 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.WorldColors;
+import net.minecraft.client.render.BackgroundRenderer;
+import net.minecraft.util.math.Vec3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(BackgroundRenderer.class)
+public class BackgroundRendererMixin {
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))
+    private static double redirectRed(Vec3d baseColor) {
+        return WorldColors.backgroundColor(baseColor).getX();
+    }
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getY()D"))
+    private static double redirectGreen(Vec3d baseColor) {
+        return WorldColors.backgroundColor(baseColor).getY();
+    }
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getZ()D"))
+    private static double redirectBlue(Vec3d baseColor) {
+        return WorldColors.backgroundColor(baseColor).getZ();
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.WorldColors;
+import com.mojang.blaze3d.systems.RenderSystem;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(RenderSystem.class)
+public class RenderSystemMixin {
+    @Shadow @Final private static float[] shaderFogColor;
+
+    @Inject(method = "_setShaderFogColor", at = @At(value ="HEAD"), cancellable = true)
+    private static void onSetShaderFogColor(float red, float green, float blue, float alpha, CallbackInfo ci){
+        if (WorldColors.INSTANCE.isEnabled() && WorldColors.getCustomFog()){
+            ci.cancel();
+            shaderFogColor[0] = WorldColors.getFogColor().getRed() / 255f;
+            shaderFogColor[1] = WorldColors.getFogColor().getGreen() / 255f;
+            shaderFogColor[2] = WorldColors.getFogColor().getBlue() / 255f;
+            shaderFogColor[3] = WorldColors.getFogColor().getAlpha() / 255f;
+        }
+    }
+}

common/src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

@@ -2,14 +2,18 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.WorldEvent;
+import com.lambda.module.modules.render.WorldColors;
+import com.lambda.util.math.ColorUtils;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 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.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientWorld.class)
 public class ClientWorldMixin {
@@ -24,4 +28,18 @@ private void handleBlockUpdateInject(BlockPos pos, BlockState state, int flags,
     private void addEntity(Entity entity, CallbackInfo ci) {
         if (EventFlow.post(new WorldEvent.EntitySpawn(entity)).isCanceled()) ci.cancel();
     }
+
+    @Inject(method = "getCloudsColor", at = @At("HEAD"), cancellable = true)
+    private void getCloudsColorInject(float tickDelta, CallbackInfoReturnable<Vec3d> cir) {
+        if (WorldColors.INSTANCE.isEnabled() && WorldColors.getCustomClouds()) {
+            cir.setReturnValue(ColorUtils.getVec3d(WorldColors.getCloudColor()));
+        }
+    }
+
+    @Inject(method = "getSkyColor", at = @At("HEAD"), cancellable = true)
+    private void getSkyColorInject(Vec3d cameraPos, float tickDelta, CallbackInfoReturnable<Vec3d> cir) {
+        if (WorldColors.INSTANCE.isEnabled() && WorldColors.getCustomSky()) {
+            cir.setReturnValue(ColorUtils.getVec3d(WorldColors.getSkyColor()));
+        }
+    }
 }

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

@@ -35,7 +35,7 @@ object DiscordRPC : Module(
     name = "DiscordRPC",
     description = "Discord Rich Presence configuration",
     defaultTags = setOf(ModuleTag.CLIENT),
-    enabledByDefault = true,
+//    enabledByDefault = true, // ToDo: Bring this back on beta release
 ) {
     private val page by setting("Page", Page.General)
 
@@ -52,7 +52,7 @@ object DiscordRPC : Module(
     /* Technical settings */
     private var rpcServer by setting("RPC Server", "http://127.0.0.1:8080") { page == Page.Settings } // TODO: Change this in production
     private var apiVersion by setting("API Version", ApiVersion.V1) { page == Page.Settings }
-    private val delay by setting("Update Delay", 5000, 5000..10000, 1, unit = "ms", visibility = { page == Page.Settings })
+    private val delay by setting("Update Delay", 15000, 15000..30000, 100, unit = "ms", visibility = { page == Page.Settings })
 
     /* Party settings */
     private val enableParty by setting("Enable Party", true, description = "Allows you to create parties.") { page == Page.Party }
@@ -64,6 +64,7 @@ object DiscordRPC : Module(
     private var startup = System.currentTimeMillis()
     private val dimensionRegex = Regex("""\b\w+_\w+\b""")
 
+    private var ready: ReadyEvent? = null
     private var discordAuth: AuthenticatePacket.Data? = null
     private var rpcAuth: Authentication? = null
     private var currentParty: AtomicReference<Party?> = AtomicReference(null)
@@ -157,6 +158,21 @@ object DiscordRPC : Module(
             rpc.disconnect()
             leaveParty(rpcServer, apiVersion.value, rpcAuth?.accessToken ?: return)
         }
+
+        ready = null
+        discordAuth = null
+        rpcAuth = null
+        currentParty.lazySet(null)
+    }
+
+    fun createParty() {
+        if (!allowed) return
+
+        createParty(rpcServer, apiVersion.value, rpcAuth?.accessToken ?: return, maxPlayers, public)
+            .also { response ->
+                if (response.error != null) warn("Failed to create a party: ${response.error}")
+                currentParty.lazySet(response.data)
+            }
     }
 
     fun join(id: String = rpc.activityManager.activity?.party?.id ?: "") {
@@ -203,20 +219,14 @@ object DiscordRPC : Module(
     }
 
     private suspend fun KDiscordIPC.register(auth: ConnectionEvent.Connect.Login.Key) {
-        // TODO: Check if the rpc is already ready
+        if (rpc.connected && ready != null) return
+
         on<ReadyEvent> {
+            ready = this
+
             // Party features
             subscribe(DiscordEvent.ActivityJoinRequest)
             subscribe(DiscordEvent.ActivityJoin)
-            //subscribe(DiscordEvent.LobbyUpdate)
-            //subscribe(DiscordEvent.LobbyDelete)
-            //subscribe(DiscordEvent.LobbyMemberConnect)
-            //subscribe(DiscordEvent.LobbyMemberDisconnect)
-            //subscribe(DiscordEvent.LobbyMemberUpdate)
-
-            // QOL features
-            //subscribe(DiscordEvent.SpeakingStart)
-            //subscribe(DiscordEvent.SpeakingStop)
 
             if (System.currentTimeMillis() - connectionTime > 300000) {
                 warn("The authentication hash has expired, reconnect to the server.")
@@ -236,11 +246,7 @@ object DiscordRPC : Module(
                     rpcAuth = response.data
                 }
 
-            if (createByDefault) createParty(rpcServer, apiVersion.value, rpcAuth?.accessToken ?: return@on, maxPlayers, public)
-                .also { response ->
-                    if (response.error != null) warn("Failed to create a party: ${response.error}")
-                    currentParty.lazySet(response.data)
-                }
+            if (createByDefault) createParty()
         }
 
         // Event when someone would like to join your party

common/src/main/kotlin/com/lambda/module/modules/render/WorldColors.kt

@@ -0,0 +1,30 @@
+package com.lambda.module.modules.render
+
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.math.ColorUtils.vec3d
+import net.minecraft.util.math.Vec3d
+import java.awt.Color
+
+object WorldColors : Module(
+    name = "World Colors",
+    description = "Changes the color of the sky",
+    defaultTags = setOf(ModuleTag.RENDER)
+){
+    @JvmStatic
+    val customSky by setting("Custom Sky", true)
+    @JvmStatic
+    val skyColor by setting("Sky Color", Color(255, 24, 75), "The color of your sky") { customSky }
+    @JvmStatic
+    val customFog by setting("Custom Fog",false)
+    @JvmStatic
+    val fogColor by setting("Fog Color", Color(255, 24, 75, 255), "The color of your fog") { customFog }
+    @JvmStatic
+    val customClouds by setting("Custom Clouds", false)
+    @JvmStatic
+    val cloudColor by setting("Cloud Color", Color(255, 24, 75)) { customClouds }
+
+    @JvmStatic
+    fun backgroundColor(base: Vec3d) =
+        if (customFog && isEnabled) fogColor.vec3d else base
+}

common/src/main/kotlin/com/lambda/util/math/ColorUtils.kt

@@ -1,5 +1,6 @@
 package com.lambda.util.math
 
+import net.minecraft.util.math.Vec3d
 import java.awt.Color
 
 object ColorUtils {
@@ -13,4 +14,7 @@ object ColorUtils {
     val Color.g get() = green.toDouble() / 255.0
     val Color.b get() = blue.toDouble() / 255.0
     val Color.a get() = alpha.toDouble() / 255.0
+
+    @JvmStatic
+    val Color.vec3d get() = Vec3d(r, g, b)
 }

common/src/main/resources/lambda.mixins.common.json

@@ -22,6 +22,7 @@
     "network.HandshakeC2SPacketMixin",
     "network.LoginHelloC2SPacketMixin",
     "network.LoginKeyC2SPacketMixin",
+    "render.BackgroundRendererMixin",
     "render.BlockRenderManagerMixin",
     "render.CameraMixin",
     "render.ChatInputSuggestorMixin",
@@ -34,6 +35,7 @@
     "render.LightmapTextureManagerMixin",
     "render.LivingEntityRendererMixin",
     "render.RenderLayersMixin",
+    "render.RenderSystemMixin",
     "render.RenderTickCounterMixin",
     "render.ScreenHandlerMixin",
     "render.VertexBufferMixin",