Merge remote-tracking branch 'origin/master' into gui_refactor_1

Author: Avanatiker

README.md

@@ -16,7 +16,7 @@ Customize your experience, and improve your efficiency!
 Find our plugins [here](https://github.com/lambda-plugins).
 
 <p align="center">
-    <a href="https://github.com/lambda-client/lambda/releases/download/3.2.1/lambda-3.2.1.jar"><img alt="lambda-3.2.1.jar" src="https://raw.githubusercontent.com/lambda-client/assets/main/download_button_3.2.1.png" width="70%" height="70%"></a>
+    <a href="https://github.com/lambda-client/lambda/releases/download/3.3.0/lambda-3.3.0.jar"><img alt="lambda-3.3.0.jar" src="https://raw.githubusercontent.com/lambda-client/assets/main/download_button_3.3.0.png" width="70%" height="70%"></a>
 </p>
 
 <div align="center">
@@ -26,7 +26,7 @@ Find our plugins [here](https://github.com/lambda-plugins).
 ## Installation
 1. Install Minecraft 1.12.2
 2. Install the latest Forge for 1.12.2 [(download)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.12.2.html)
-3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/3.2.1/lambda-3.2.1.jar)
+3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/3.3.0/lambda-3.3.0.jar)
 4. Put the file in your `.minecraft/mods` folder
 
 ## FAQ

build.gradle

@@ -13,6 +13,7 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
+    id 'maven-publish'
 }
 
 apply plugin: 'net.minecraftforge.gradle'
@@ -61,8 +62,9 @@ minecraft {
 
 configurations {
     jarLibs
+    onlyJarLibs
     // Force choosing the correct nightly build because Mac OS chooses an invalid one
-    all {
+    configureEach {
         resolutionStrategy {
             force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209'
         }
@@ -109,10 +111,10 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
 
     // This Baritone will NOT be included in the jar
-    implementation 'com.github.cabaletta:baritone:1.2.14'
+    implementation('cabaletta:baritone-deobf-unoptimized-mcp-dev:1.2').setChanging(true)
 
     // This Baritone WILL be included in the jar
-    jarLibs 'cabaletta:baritone-api:1.2'
+    onlyJarLibs('cabaletta:baritone-api:1.2').setChanging(true)
 
     // Add everything in jarLibs to implementation (compile)
     implementation configurations.jarLibs
@@ -137,23 +139,23 @@ processResources {
     }
 }
 
-task buildApiSource(type: Jar) { // Generate sources
+tasks.register('buildApiSource', Jar) { // Generate sources
     group 'build'
     description 'Assemble API library source archive'
 
     archiveClassifier.set 'api-source'
     from sourceSets.main.allSource
 }
 
-task buildApi(type: Jar) {
+tasks.register('buildApi', Jar) {
     group 'build'
     description 'Assemble API library archive'
 
     archiveClassifier.set 'api'
     from sourceSets.main.output
 }
 
-task buildAll {
+tasks.register('buildAll') {
     group 'build'
     description 'Assemble all jars'
 
@@ -184,7 +186,7 @@ shadowJar {
             'kotlin/**/*.kotlin_metadata',
             'kotlin/**/*.kotlin_builtins',
             'META-INF/*.version'
-    configurations = [project.configurations.jarLibs]
+    configurations = [project.configurations.jarLibs, project.configurations.onlyJarLibs]
     relocate 'kotlin', 'com.lambda.shadow.kotlin'
     relocate 'kotlinx', 'com.lambda.shadow.kotlinx'
     finalizedBy 'configureReobfTaskForReobfShadowJar', 'reobfShadowJar'
@@ -198,7 +200,11 @@ reobf {
     }
 }
 
-artifacts {
-    shadowJar
-}
-
+publishing {
+    publications {
+        api(MavenPublication) {
+            artifact source: buildApi, classifier: null
+            artifact source: buildApiSource, classifier: 'sources'
+        }
+    }
+}

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.caching=true
 org.gradle.parallel=true
 
 modGroup=com.lambda
-modVersion=3.2.1
+modVersion=3.3.0
 
 minecraftVersion=1.12.2
 forgeVersion=14.23.5.2860
 mappingsChannel=stable
 mappingsVersion=39-1.12
 
-kotlinVersion=1.8.0
-kotlinxCoroutinesVersion=1.6.4
+kotlinVersion=1.8.20
+kotlinxCoroutinesVersion=1.7.0-RC

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/lambda/mixin/network/MixinNetHandlerPlayClient.java

@@ -0,0 +1,23 @@
+package com.lambda.mixin.network;
+
+import com.lambda.client.event.LambdaEventBus;
+import com.lambda.client.event.events.ChunkDataEvent;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.server.SPacketChunkData;
+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(value = NetHandlerPlayClient.class)
+public class MixinNetHandlerPlayClient {
+
+    @Shadow private WorldClient world;
+
+    @Inject(method = "handleChunkData", at = @At("TAIL"))
+    public void handleChunkData(SPacketChunkData packetIn, CallbackInfo ci) {
+        LambdaEventBus.INSTANCE.post(new ChunkDataEvent(packetIn.isFullChunk(), this.world.getChunk(packetIn.getChunkX(), packetIn.getChunkZ())));
+    }
+}