Merge branch 'master' into refactor/ui

Author: emyfops

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

@@ -20,7 +20,6 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 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;
@@ -81,8 +80,6 @@ private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
         if (screen instanceof ScreenHandlerProvider<?> handledScreen) {
             EventFlow.post(new ScreenHandlerEvent.Open(handledScreen.getScreenHandler()));
         }
-
-        EventFlow.post(new ScreenEvent.Open<>(screen));
     }
 
     @Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;removed()V", shift = At.Shift.AFTER))
@@ -91,8 +88,6 @@ private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
         if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {
             EventFlow.post(new ScreenHandlerEvent.Close(handledScreen.getScreenHandler()));
         }
-
-        EventFlow.post(new ScreenEvent.Close<>(currentScreen));
     }
 
     @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))

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

@@ -18,8 +18,7 @@
 package com.lambda.mixin.entity;
 
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.AttackEvent;
-import com.lambda.event.events.InteractionEvent;
+import com.lambda.event.events.PlayerEvent;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
@@ -29,6 +28,7 @@
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Final;
@@ -44,53 +44,55 @@ public class ClientPlayInteractionManagerMixin {
 
     @Shadow
     public float currentBreakingProgress;
-    @Final
-    @Shadow
-    private MinecraftClient client;
 
-    @Inject(method = "interactBlock", at = @At("HEAD"))
+    @Inject(method = "interactBlock", at = @At("HEAD"), cancellable = true)
     public void interactBlockHead(final ClientPlayerEntity player, final Hand hand, final BlockHitResult hitResult, final CallbackInfoReturnable<ActionResult> cir) {
-        if (client.world == null) return;
-        EventFlow.post(new InteractionEvent.Block(client.world, hitResult));
+        if (EventFlow.post(new PlayerEvent.Interact.Block(hand, hitResult)).isCanceled()) {
+            cir.setReturnValue(ActionResult.FAIL);
+        }
     }
 
-    @Inject(method = "clickSlot", at = @At("HEAD"), cancellable = true)
-    public void clickSlotHead(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player, CallbackInfo ci) {
-        if (syncId != player.currentScreenHandler.syncId) return;
-        var click = new InteractionEvent.SlotClick(syncId, slotId, button, actionType, player.currentScreenHandler);
-        if (EventFlow.post(click).isCanceled()) ci.cancel();
+    @Inject(method = "interactEntityAtLocation", at = @At("HEAD"), cancellable = true)
+    public void interactEntityAtLocation(PlayerEntity player, Entity entity, EntityHitResult hitResult, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
+        if (EventFlow.post(new PlayerEvent.Interact.Entity(hand, entity, hitResult)).isCanceled()) {
+            cir.setReturnValue(ActionResult.FAIL);
+        }
     }
 
-    @Inject(method = "attackEntity", at = @At("HEAD"), cancellable = true)
-    void onAttackPre(PlayerEntity player, Entity target, CallbackInfo ci) {
-        if (EventFlow.post(new AttackEvent.Pre(target)).isCanceled()) ci.cancel();
+    @Inject(method = "interactItem", at = @At("HEAD"), cancellable = true)
+    public void interactItemHead(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
+        if (EventFlow.post(new PlayerEvent.Interact.Item(hand)).isCanceled()) {
+            cir.setReturnValue(ActionResult.FAIL);
+        }
     }
 
-    @Inject(method = "attackEntity", at = @At("TAIL"))
-    void onAttackPost(PlayerEntity player, Entity target, CallbackInfo ci) {
-        EventFlow.post(new AttackEvent.Post(target));
+    @Inject(method = "attackBlock", at = @At("HEAD"))
+    public void onAttackBlock(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
+        if (EventFlow.post(new PlayerEvent.Attack.Block(pos, side)).isCanceled()) cir.cancel();
     }
 
-    @Inject(method = "attackBlock", at = @At("HEAD"), cancellable = true)
-    public void onAttackBlock(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new InteractionEvent.BlockAttack.Pre(pos, side)).isCanceled()) cir.cancel();
+    @Inject(method = "attackEntity", at = @At("HEAD"), cancellable = true)
+    void onAttackPre(PlayerEntity player, Entity target, CallbackInfo ci) {
+        if (EventFlow.post(new PlayerEvent.Attack.Entity(target)).isCanceled()) ci.cancel();
     }
 
-    @Inject(method = "attackBlock", at = @At("TAIL"))
-    public void onAttackBlockPost(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        EventFlow.post(new InteractionEvent.BlockAttack.Post(pos, side));
+    @Inject(method = "clickSlot", at = @At("HEAD"), cancellable = true)
+    public void clickSlotHead(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player, CallbackInfo ci) {
+        if (syncId != player.currentScreenHandler.syncId) return;
+        var click = new PlayerEvent.SlotClick(syncId, slotId, button, actionType, player.currentScreenHandler);
+        if (EventFlow.post(click).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)
     private void updateBlockBreakingProgressPre(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        var event = EventFlow.post(new InteractionEvent.BreakingProgress.Pre(pos, side, currentBreakingProgress));
-        if (event.isCanceled()) cir.cancel();
+        var event = EventFlow.post(new PlayerEvent.Breaking.Update(pos, side, currentBreakingProgress));
+        if (event.isCanceled()) cir.setReturnValue(false);
 
         currentBreakingProgress = event.getProgress();
     }
 
-    @Inject(method = "updateBlockBreakingProgress", at = @At("TAIL"))
-    private void updateBlockBreakingProgressPost(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        EventFlow.post(new InteractionEvent.BreakingProgress.Post(pos, side, currentBreakingProgress));
+    @Inject(method = "cancelBlockBreaking", at = @At("HEAD"), cancellable = true)
+    private void cancelBlockBreakingPre(CallbackInfo ci) {
+        if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();
     }
 }

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

@@ -19,7 +19,7 @@
 
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.EntityEvent;
+import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
@@ -50,9 +50,6 @@ public abstract class ClientPlayerEntityMixin extends EntityMixin {
     @Shadow
     protected abstract void autoJump(float dx, float dz);
 
-    @Shadow
-    public abstract boolean isUsingItem();
-
     @Inject(method = "move", at = @At("HEAD"), cancellable = true)
     void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
         ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
@@ -63,9 +60,9 @@ void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
         float prevX = (float) self.getX();
         float prevZ = (float) self.getZ();
 
-        EventFlow.post(new MovementEvent.Pre());
+        EventFlow.post(new MovementEvent.Player.Pre(movementType, movement));
         super.move(movementType, self.getVelocity());
-        EventFlow.post(new MovementEvent.Post());
+        EventFlow.post(new MovementEvent.Player.Post(movementType, movement));
 
         float currX = (float) self.getX();
         float currZ = (float) self.getZ();
@@ -125,6 +122,6 @@ float fixHeldItemPitch(ClientPlayerEntity instance) {
 
     @Inject(method = "swingHand", at = @At("HEAD"), cancellable = true)
     void onSwingHandPre(Hand hand, CallbackInfo ci) {
-        if (EventFlow.post(new EntityEvent.SwingHand(hand)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
 }

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

@@ -19,7 +19,7 @@
 
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.EntityEvent;
+import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.WorldEvent;
 import com.lambda.interaction.RotationManager;
 import com.lambda.util.math.Vec2d;
@@ -87,7 +87,7 @@ float fixDirectionPitch2(Entity entity) {
 
     @Inject(method = "changeLookDirection", at = @At("HEAD"), cancellable = true)
     private void changeLookDirection(double cursorDeltaX, double cursorDeltaY, CallbackInfo ci) {
-        if (EventFlow.post(new EntityEvent.ChangeLookDirection(cursorDeltaX, cursorDeltaY)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new PlayerEvent.ChangeLookDirection(cursorDeltaX, cursorDeltaY)).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "onTrackedDataSet(Lnet/minecraft/entity/data/TrackedData;)V", at = @At("TAIL"))

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

@@ -63,18 +63,12 @@ void onJump(CallbackInfo ci) {
 
     @Inject(method = "travel", at = @At("HEAD"), cancellable = true)
     void onTravelPre(Vec3d movementInput, CallbackInfo ci) {
-        LivingEntity self = (LivingEntity) (Object) this;
-        if (self != Lambda.getMc().player) return;
-
-        if (EventFlow.post(new MovementEvent.Travel.Pre()).isCanceled()) ci.cancel();
+        if (EventFlow.post(new MovementEvent.Entity.Pre((LivingEntity) (Object) this, movementInput)).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "travel", at = @At("TAIL"))
     void onTravelPost(Vec3d movementInput, CallbackInfo ci) {
-        LivingEntity self = (LivingEntity) (Object) this;
-        if (self != Lambda.getMc().player) return;
-
-        EventFlow.post(new MovementEvent.Travel.Post());
+        EventFlow.post(new MovementEvent.Entity.Post((LivingEntity) (Object) this, movementInput));
     }
 
     @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPitch()F"))

common/src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -18,7 +18,7 @@
 package com.lambda.mixin.input;
 
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.KeyPressEvent;
+import com.lambda.event.events.KeyboardEvent;
 import net.minecraft.client.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,9 +28,19 @@
 @Mixin(Keyboard.class)
 public class KeyboardMixin {
     @Inject(method = "onKey", at = @At("HEAD"))
-    void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
+    private void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
         if (key <= 0) return;
-        if (action != 1) return;
-        EventFlow.post(new KeyPressEvent(key, scancode, action, modifiers));
+        if (action != 1) return; // TODO: Post events on both press and release ?
+
+        EventFlow.post(new KeyboardEvent.Press(key, scancode, action, modifiers));
+    }
+
+    @Inject(method = "onChar", at = @At("HEAD"))
+    private void onChar(long window, int codePoint, int modifiers, CallbackInfo ci) {
+        char[] chars = Character.toChars(codePoint);
+
+        for (char c : chars) {
+            EventFlow.post(new KeyboardEvent.Char(c));
+        }
     }
 }

common/src/main/java/com/lambda/mixin/input/MouseMixin.java

@@ -0,0 +1,66 @@
+/*
+ * 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.mixin.input;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.MouseEvent;
+import com.lambda.util.math.Vec2d;
+import net.minecraft.client.Mouse;
+import com.lambda.util.Mouse.Button;
+import com.lambda.util.Mouse.Action;
+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(Mouse.class)
+public class MouseMixin {
+    @Shadow private double x;
+
+    @Shadow private double y;
+
+    @Inject(method = "onMouseButton(JIII)V", at = @At("HEAD"), cancellable = true)
+    private void onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) {
+        Vec2d position = new Vec2d(x, y);
+
+        if (EventFlow.post(new MouseEvent.Click(button, action, mods, position)).isCanceled()) {
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "onMouseScroll(JDD)V", at = @At("HEAD"), cancellable = true)
+    private void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
+        Vec2d delta = new Vec2d(horizontal, vertical);
+
+        if (EventFlow.post(new MouseEvent.Scroll(delta)).isCanceled()) {
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "onCursorPos(JDD)V", at = @At("HEAD"), cancellable = true)
+    private void onCursorPos(long window, double x, double y, CallbackInfo ci) {
+        if (x + y == this.x + this.y) return;
+
+        Vec2d position = new Vec2d(x, y);
+
+        if (EventFlow.post(new MouseEvent.Move(position)).isCanceled()) {
+            ci.cancel();
+        }
+    }
+}

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

@@ -44,7 +44,7 @@ public class ClientConnectionMixin {
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
-        if (side != NetworkSide.SERVERBOUND) return;
+        if (side != NetworkSide.CLIENTBOUND) return;
 
         if (EventFlow.post(new PacketEvent.Send.Pre((Packet<ServerPacketListener>) packet)).isCanceled()) {
             callbackInfo.cancel();
@@ -53,7 +53,7 @@ private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("RETURN"))
     private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo) {
-        if (side != NetworkSide.SERVERBOUND) return;
+        if (side != NetworkSide.CLIENTBOUND) return;
 
         EventFlow.post(new PacketEvent.Send.Post((Packet<ServerPacketListener>) packet));
     }

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

@@ -19,18 +19,28 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ConnectionEvent;
-import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.encryption.NetworkEncryptionException;
+import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
+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;
 
-import java.util.UUID;
+import java.security.PublicKey;
 
-@Mixin(LoginHelloC2SPacket.class)
-public class LoginHelloC2SPacketMixin {
-    @Inject(method = "<init>(Ljava/lang/String;Ljava/util/UUID;)V", at = @At("TAIL"))
-    private void onLoginHelloC2SPacket(String string, UUID uUID, CallbackInfo ci) {
-        EventFlow.post(new ConnectionEvent.Connect.Login.Hello(string, uUID));
+@Mixin(LoginHelloS2CPacket.class)
+public abstract class LoginHelloC2SPacketMixin {
+    @Shadow @Final private String serverId;
+
+    @Shadow @Final private byte[] nonce;
+
+    @Shadow public abstract PublicKey getPublicKey() throws NetworkEncryptionException;
+
+    @Inject(method = "<init>(Lnet/minecraft/network/PacketByteBuf;)V", at = @At("TAIL"))
+    private void onLoginHelloC2SPacket(PacketByteBuf buf, CallbackInfo ci) throws NetworkEncryptionException {
+        EventFlow.post(new ConnectionEvent.Connect.Login.EncryptionRequest(serverId, getPublicKey(), nonce));
     }
 }

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

@@ -32,8 +32,6 @@
 public class LoginKeyC2SPacketMixin {
     @Inject(method = "<init>(Ljavax/crypto/SecretKey;Ljava/security/PublicKey;[B)V", at = @At("TAIL"))
     private void onLoginKeyC2SPacket(SecretKey secretKey, PublicKey publicKey, byte[] nonce, CallbackInfo ci) {
-        // Please note this won't work if the server is offline mode because the player doesn't
-        // fetch the server's public key.
-        EventFlow.post(new ConnectionEvent.Connect.Login.Key(secretKey, publicKey, nonce));
+        EventFlow.post(new ConnectionEvent.Connect.Login.EncryptionResponse(secretKey, publicKey, nonce));
     }
 }