Merge branch '1.21.5' into breakmanager-fix

# Conflicts:
#	src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt
#	src/main/kotlin/com/lambda/interaction/request/breaking/RebreakManager.kt

Author: beanbag44

.idea/scopes/Copyright.xml

@@ -16,30 +16,27 @@
  */
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.internal.jvm.*
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.register
+import org.gradle.internal.jvm.Jvm
 import java.util.*
 
-val modId               : String by project
-val mavenGroup          : String by project
-val modVersion          : String by project
-val minecraftVersion    : String by project
-val yarnMappings        : String by project
-val fabricLoaderVersion : String by project
-val fabricApiVersion    : String by project
-val kotlinFabricVersion : String by project
-val pngEncoderVersion   : String by project
-val discordIPCVersion   : String by project
-val classGraphVersion   : String by project
-val kotlinVersion       : String by project
-val ktorVersion         : String by project
-val mockitoKotlin       : String by project
-val mockitoInline       : String by project
-val mockkVersion        : String by project
-val spairVersion        : String by project
-val lwjglVersion        : String by project
+val modId: String by project
+val mavenGroup: String by project
+val modVersion: String by project
+val minecraftVersion: String by project
+val yarnMappings: String by project
+val fabricLoaderVersion: String by project
+val fabricApiVersion: String by project
+val kotlinFabricVersion: String by project
+val pngEncoderVersion: String by project
+val discordIPCVersion: String by project
+val classGraphVersion: String by project
+val kotlinVersion: String by project
+val ktorVersion: String by project
+val mockitoKotlin: String by project
+val mockitoInline: String by project
+val mockkVersion: String by project
+val spairVersion: String by project
+val lwjglVersion: String by project
 
 
 val libs = file("libs")
@@ -169,7 +166,11 @@ dependencies {
 
     // Ktor
     includeLib("io.ktor:ktor-client-core:$ktorVersion")
-    shadowLib("io.ktor:ktor-client-cio:$ktorVersion") { exclude(group = "org.jetbrains.kotlin"); exclude(group = "org.jetbrains.kotlinx"); exclude(group = "org.slf4j") }
+    shadowLib("io.ktor:ktor-client-cio:$ktorVersion") {
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+        exclude(group = "org.slf4j")
+    }
     includeLib("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
 

.idea/scopes/UsageScope.xml

@@ -73,7 +73,7 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o
                     });
         }
 
-        list.add("\n"+"-".repeat(43)+"\n");
+        list.add("\n" + "-".repeat(43) + "\n");
 
         return original.call(type, list);
     }

build.gradle.kts

@@ -35,9 +35,9 @@
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.sound.SoundManager;
-import net.minecraft.util.thread.ThreadExecutor;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.thread.ThreadExecutor;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/com/lambda/mixin/CrashReportMixin.java

@@ -52,21 +52,15 @@
 
 @Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
-
-    @Shadow
-    public Input input;
-
-    @Shadow
-    private boolean autoJumpEnabled;
+    @Shadow public Input input;
+    @Shadow @Final protected MinecraftClient client;
+    @Shadow private boolean autoJumpEnabled;
 
     public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
         super(world, profile);
     }
 
-    @Shadow
-    protected abstract void autoJump(float dx, float dz);
-
-    @Shadow @Final protected MinecraftClient client;
+    @Shadow protected abstract void autoJump(float dx, float dz);
 
     /**
      * Post movement events and applies the modified player velocity

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -20,8 +20,8 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.module.modules.render.ViewModel;
 import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.module.modules.render.ViewModel;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -34,11 +34,9 @@
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends EntityMixin {
 
-    @Shadow
-    protected abstract float getJumpVelocity();
+    @Unique private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
 
-    @Unique
-    private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
+    @Shadow protected abstract float getJumpVelocity();
 
     /**
      * Overwrites the jump function to use our rotation and movements

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

@@ -21,7 +21,6 @@
 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;

src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java

@@ -89,8 +89,7 @@ private void receivingPacketPost(
     }
 
     @Inject(method = "connect(Ljava/lang/String;ILnet/minecraft/network/state/NetworkState;Lnet/minecraft/network/state/NetworkState;Lnet/minecraft/network/listener/ClientPacketListener;Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("HEAD"), cancellable = true)
-    private
-    <S extends ServerPacketListener, C extends ClientPacketListener>
+    private <S extends ServerPacketListener, C extends ClientPacketListener>
     void onConnect(
             String address,
             int port,
@@ -100,7 +99,8 @@ void onConnect(
             ConnectionIntent intent,
             CallbackInfo ci
     ) {
-        if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, prePlayStateListener, intent)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, prePlayStateListener, intent)).isCanceled())
+            ci.cancel();
     }
 
     @Inject(method = "disconnect(Lnet/minecraft/text/Text;)V", at = @At("HEAD"))

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

@@ -63,11 +63,11 @@ private void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket packet,
     /**
      * Sets displayedUnsecureChatWarning to {@link NoRender#getNoChatVerificationToast()}
      * <pre>{@code
-  	 * this.secureChatEnforced = packet.enforcesSecureChat();
+     * this.secureChatEnforced = packet.enforcesSecureChat();
      * if (this.serverInfo != null && !this.displayedUnsecureChatWarning && !this.isSecureChatEnforced()) {
-            SystemToast systemToast = SystemToast.create(this.client, SystemToast.Type.UNSECURE_SERVER_WARNING, UNSECURE_SERVER_TOAST_TITLE, UNSECURE_SERVER_TOAST_TEXT);
-            this.client.getToastManager().add(systemToast);
-            this.displayedUnsecureChatWarning = true;
+     * SystemToast systemToast = SystemToast.create(this.client, SystemToast.Type.UNSECURE_SERVER_WARNING, UNSECURE_SERVER_TOAST_TITLE, UNSECURE_SERVER_TOAST_TEXT);
+     * this.client.getToastManager().add(systemToast);
+     * this.displayedUnsecureChatWarning = true;
      * }
      * }</pre>
      */