Merge remote-tracking branch 'origin/1.21.5' into feature/more-freecam-features

# Conflicts:
#	src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

Author: IceTank

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -23,14 +23,11 @@ body:
       value: "The game should have loaded"
     validations:
       required: true
-  - type: dropdown
+  - type: input
     id: version
     attributes:
       label: Version
       description: What version of Lambda are you using?
-      options:
-        - 1.0.0
-      default: 0
     validations:
       required: true
   - type: input

.github/workflows/build.yml

@@ -25,14 +25,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Get Short Commit Hash
-        id: vars
-        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
       - name: Set-Up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'oracle'
           java-version: '21'
           architecture: x64
           cache: 'gradle'
@@ -44,24 +40,25 @@ jobs:
           file: gradle.properties
           all: true
 
-      - name: Publish commit to maven
-        id: upload
-        run: ./gradlew publish -PmavenType=snapshots -PcommitHash=${{ env.COMMIT_HASH }} -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
-
       - name: Publish snapshot to maven
+        if: github.event_name == 'push'
         run: ./gradlew publish -PmavenType=snapshots -PcommitHash=SNAPSHOT -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
 
       - name: Generate Summary
-        if: steps.upload.conclusion == 'success'
+        if: steps.upload.conclusion == 'success' && github.event_name == 'push'
         run: |
           cat << EOF >> $GITHUB_STEP_SUMMARY
           ### [Lambda ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://maven.lambda-client.org/snapshots/com/lambda/lambda/${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
           EOF
 
+      - name: Rename jar
+        if: steps.upload.conclusion == 'failure' || github.event_name == 'pull_request'
+        run: mv /build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar /build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
+
       - name: Failover Upload
-        if: steps.upload.conclusion == 'failure'
+        if: steps.upload.conclusion == 'failure' || github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: lambda-nightly
           path: |
-            /build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
+            /build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar

.idea/codeStyles/Project.xml

@@ -18,11 +18,11 @@
 # Lambda https://github.com/lambda-client/lambda
 modId=lambda
 modName=Lambda
-modVersion=1.0.0
+modVersion=0.0.1
 modDescription=Minecraft utility mod for automation
 modIcon=assets/lambda/lambda.png
 mavenGroup=com.lambda
-modAuthors=Avanatiker, Blade, beanbag44, Emy
+modAuthors=Constructor (Avanatiker), Blade, beanbag44, Emy
 
 # General
 minecraftVersion=1.21.5

gradle.properties

@@ -18,10 +18,10 @@
 package com.lambda.mixin;
 
 import com.lambda.Lambda;
-import com.lambda.config.AbstractSetting;
+import com.lambda.config.Setting;
 import com.lambda.module.Module;
 import com.lambda.module.ModuleRegistry;
-import com.lambda.util.DynamicException;
+import com.lambda.util.DynamicExceptionKt;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.MinecraftClient;
@@ -47,7 +47,7 @@ public class CrashReportMixin {
     @Inject(method = "<init>(Ljava/lang/String;Ljava/lang/Throwable;)V", at = @At("TAIL"))
     void injectConstructor(String message, Throwable cause, CallbackInfo ci) {
         if (!Lambda.INSTANCE.isDebug() && MinecraftClient.getInstance() != null) {
-            this.cause = new DynamicException(cause);
+            this.cause = DynamicExceptionKt.dynamicException(cause);
         }
     }
 
@@ -67,7 +67,7 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o
 
                         module.getSettings()
                                 .stream()
-                                .filter(AbstractSetting::isModified)
+                                .filter(Setting::isModified)
                                 .forEach(setting -> list.add(String.format("\t\t%s -> %s", setting.getName(), setting.getValue())));
                     });
         }

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

@@ -24,10 +24,13 @@
 import com.lambda.event.events.TickEvent;
 import com.lambda.gui.DearImGui;
 import com.lambda.gui.components.ClickGuiLayout;
+import com.lambda.module.modules.movement.BetterFirework;
 import com.lambda.module.modules.player.Interact;
 import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
 import com.lambda.util.WindowUtils;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -48,7 +51,6 @@
 import org.spongepowered.asm.mixin.Unique;
 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;
 
 @Mixin(value = MinecraftClient.class, priority = Integer.MAX_VALUE)
@@ -153,10 +155,10 @@ private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
         }
     }
 
-    @Redirect(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
-    private void redirectUnPressAll() {
+    @WrapOperation(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
+    private void redirectUnPressAll(Operation<Void> original) {
         if (!InventoryMove.getShouldMove()) {
-            KeyBinding.unpressAll();
+            original.call();
             return;
         }
         KeyBinding.KEYS_BY_ID.values().forEach(bind -> {
@@ -166,20 +168,16 @@ private void redirectUnPressAll() {
         });
     }
 
-    @Redirect(method = "doAttack()Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
-    private void redirectHandSwing(ClientPlayerEntity instance, Hand hand) {
-        if (this.crosshairTarget == null) return;
-        if (this.crosshairTarget.getType() != HitResult.Type.BLOCK || PacketMine.INSTANCE.isDisabled()) {
-            instance.swingHand(hand);
-        }
+    @WrapWithCondition(method = "doAttack()Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
+    private boolean redirectHandSwing(ClientPlayerEntity instance, Hand hand) {
+        if (this.crosshairTarget == null) return false;
+        return this.crosshairTarget.getType() != HitResult.Type.BLOCK || PacketMine.INSTANCE.isDisabled();
     }
 
-    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
-    boolean redirectMultiActon(ClientPlayerInteractionManager instance) {
-        if (instance == null) return true;
-
+    @ModifyExpressionValue(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
+    boolean redirectMultiActon(boolean original) {
         if (Interact.INSTANCE.isEnabled() && Interact.getMultiAction()) return false;
-        return instance.isBreakingBlock();
+        return original;
     }
 
     @Inject(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isRiding()Z"))
@@ -189,6 +187,18 @@ void injectFastPlace(CallbackInfo ci) {
         itemUseCooldown = Interact.getPlaceDelay();
     }
 
+    @WrapMethod(method = "doItemUse")
+    void injectItemUse(Operation<Void> original) {
+        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onInteract())
+            original.call();
+    }
+
+    @WrapMethod(method = "doItemPick")
+    void injectItemPick(Operation<Void> original) {
+        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onPick())
+            original.call();
+    }
+
     @WrapMethod(method = "getTargetMillisPerTick")
     float getTargetMillisPerTick(float millis, Operation<Float> original) {
         var length = TimerManager.INSTANCE.getLength();

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

@@ -21,7 +21,7 @@
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -22,7 +22,7 @@
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 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/baritone/MixinLookBehavior.java

@@ -20,12 +20,19 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
+import com.lambda.interaction.managers.inventory.InventoryManager;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.recipebook.ClientRecipeBook;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.stat.StatHandler;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -36,13 +43,11 @@
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayerInteractionManager.class)
 public class ClientPlayInteractionManagerMixin {
-
     @Shadow
     public float currentBreakingProgress;
 
@@ -98,9 +103,9 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @Redirect(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
-    public int overrideSelectedSlotSync(PlayerInventory instance) {
-        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(instance.getSelectedSlot())).getSlot();
+    @ModifyExpressionValue(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
+    public int overrideSelectedSlotSync(int original) {
+        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(original)).getSlot();
     }
 
     @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)
@@ -115,4 +120,11 @@ private void updateBlockBreakingProgressPre(BlockPos pos, Direction side, Callba
     private void cancelBlockBreakingPre(CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();
     }
+
+    @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;")
+    private ClientPlayerEntity injectCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, boolean lastSneaking, boolean lastSprinting, Operation<ClientPlayerEntity> original) {
+        var player = original.call(world, statHandler, recipeBook, lastSneaking, lastSprinting);
+        InventoryManager.INSTANCE.setScreenHandler(player.playerScreenHandler);
+        return player;
+    }
 }