Merge branch 'master' into feature/taskflow

Author: emyfops

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

@@ -2,7 +2,10 @@
 
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.*;
+import com.lambda.event.events.ClientEvent;
+import com.lambda.event.events.ScreenEvent;
+import com.lambda.event.events.ScreenHandlerEvent;
+import com.lambda.event.events.TickEvent;
 import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -18,7 +21,9 @@
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
-    @Shadow @Nullable public Screen currentScreen;
+    @Shadow
+    @Nullable
+    public Screen currentScreen;
 
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {

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

@@ -25,13 +25,12 @@
 @Mixin(ClientPlayerInteractionManager.class)
 public class ClientPlayInteractionManagerMixin {
 
+    @Shadow
+    public float currentBreakingProgress;
     @Final
     @Shadow
     private MinecraftClient client;
 
-    @Shadow
-    public float currentBreakingProgress;
-
     @Inject(method = "interactBlock", at = @At("HEAD"))
     public void interactBlockHead(final ClientPlayerEntity player, final Hand hand, final BlockHitResult hitResult, final CallbackInfoReturnable<ActionResult> cir) {
         if (client.world == null) return;

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

@@ -18,9 +18,8 @@ public class FireworkRocketEntityMixin {
             )
     )
     private void redirectSetVelocity(LivingEntity shooter, Vec3d vec3d) {
-        if (ElytraFly.getDoBoost()){
+        if (ElytraFly.getDoBoost()) {
             ElytraFly.boostRocket(shooter);
-        }
-        else shooter.setVelocity(vec3d);
+        } else shooter.setVelocity(vec3d);
     }
-}
+}

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

@@ -4,7 +4,6 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.interaction.RotationManager;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;

common/src/main/java/com/lambda/mixin/network/ClientLoginNetworkMixin.java

@@ -2,15 +2,12 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ConnectionEvent;
-import com.lambda.module.modules.client.DiscordRPC;
 import net.minecraft.client.network.ClientLoginNetworkHandler;
 import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
-import net.minecraft.text.Text;
 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(ClientLoginNetworkHandler.class)
 public class ClientLoginNetworkMixin {

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

@@ -11,11 +11,13 @@
 
 @Mixin(RenderSystem.class)
 public class RenderSystemMixin {
-    @Shadow @Final private static float[] shaderFogColor;
+    @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()){
+    @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;

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

@@ -7,15 +7,18 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.function.IntSupplier;
 
 @Mixin(SplashOverlay.class)
 public class SplashOverlayMixin {
     @Mutable
-    @Shadow @Final
+    @Shadow
+    @Final
     static Identifier LOGO;
 
     @Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I"))

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

@@ -14,7 +14,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(BlockCollisionSpliterator.class)
-public abstract class BlockCollisionSpliteratorMixin <T extends AbstractIterator<T>> {
+public abstract class BlockCollisionSpliteratorMixin<T extends AbstractIterator<T>> {
     @Redirect(method = "computeNext", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;getCollisionShape(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/ShapeContext;)Lnet/minecraft/util/shape/VoxelShape;"))
     private VoxelShape collisionShapeRedirect(BlockState instance, BlockView blockView, BlockPos blockPos, ShapeContext shapeContext) {
         VoxelShape collisionShape = instance.getCollisionShape(blockView, blockPos, shapeContext);

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.lambda
 
 import com.google.gson.Gson

common/src/main/kotlin/com/lambda/LoaderInfo.kt

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.lambda
 
 import dev.architectury.injectables.annotations.ExpectPlatform