Merge branch 'master' into refactor/ui

Author: Avanatiker

.github/CONTRIBUTING.md

@@ -103,18 +103,7 @@ First of all, make sure to read or simply check the [Official Kotlin Coding Conv
 
 This is required for pull requests to be accepted, or even reviewed.
 
-You will need the following before contributing:
-- GitHub CLI / Desktop
-- IntelliJ IDEA
-- Java 17 SDK
-- [Minecraft Development Plugin](https://plugins.jetbrains.com/plugin/8327-minecraft-development)
-
-After you have everything you can do the following:
-- Clone the repository `git clone https://github.com/lambda-client/lambda`
-- Open the project, **inside the project folder**, in IntelliJ IDEA
-- Set the java runtime in `File > Project Structure > SDK > JDK 17`
-- Wait for Gradle to resolve dependencies and to set up the project.
-- And you should now be able to run the project using the [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html)
+After this, you can read the [getting started](https://github.com/lambda-client/wiki/Getting-Started) section in the wiki
 
 ### Improving The Documentation
 If you believe that some documentation can be improved or added, please discuss with us on our [Discord](https://discord.gg/QjfBxJzE5x)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,22 +1,35 @@
 # Pull Request Guidelines
+
 ### This is a template, modify before submitting your PR
 
 Please ensure that your PR title follows this format:
-- `[Minecraft Version] [Mod loader] Feat, Fix, Ref, Docs, ..., : Description`
+- `[Minecraft Version] <Mod loader> Feat, Fix, Ref, Docs, ..., : Description`
 
 **Examples:**
-- `[1.20.x] [Forge] Feat: Add new block types`
-- `[1.19.x] [All] Fix: Crash on startup`
-- `[1.20.x] [Fabric] Refactor: Optimize rendering engine`
+- `[1.20.4] Feat: Add new block types`
+- `[1.21.4] [All] Fix: Crash on startup`
+- `[1.21.3] [Forge] Fix: GUI does not render`
+- `[1.20.1] Ref: Optimize rendering engine`
 
-# Issue Link
-Please create an issue if there are none applicable before submitting this pull request. 
+### Issue Link
+If your PR addresses one or more issues, be sure to link them. Use appropriate keywords like `closes`, `fixes`, or `resolves` to automatically close the linked issues when the PR is merged.
 
-Then link the issue as follows:`Closes #123`
+#### **Examples:**
+- `This PR fixes a memory leak in foo() and closes #4. It also resolves #5, which is a duplicate issue.`
+- `Closes #1, resolves #2, and fixes #3`
+- `Fixes #1`
 
-# Description
+### Description
+Provide a concise yet detailed summary of the changes introduced in this PR. Include the purpose of the changes and any relevant context.
 
-Provide a brief description of the changes made in this PR:
+#### **Examples:**
+- `This pull request improves compatibility with version 1.21.4 by addressing rendering issues and adding support for new block types.`
+- `Refactors the rendering engine to enhance performance and reduce memory usage.`
+- `Adds a new feature for biome-specific block spawning to align with gameplay mechanics introduced in version 1.20.4.`
 
-- **What does this PR do?**
-- **Why is this change needed?**
+### Checklist Before Submitting
+To ensure the quality and maintainability of your PR, confirm the following before submission:
+1. Code adheres to the project's style guide and conventions.
+2. All tests pass, including newly added tests.
+3. Documentation has been updated to reflect any new features or changes.
+4. Your PR is limited to a single purpose, avoiding unrelated changes.

.gitignore

@@ -10,6 +10,7 @@ build/
 .idea/compiler.xml
 .idea/libraries/
 .idea/
+!.idea/scopes
 *.iws
 *.iml
 *.ipr
@@ -53,4 +54,3 @@ logs/
 
 ### Kotlin ###
 *.kotlin_module
-.kotlin/

.idea/scopes/UsageScope.xml

@@ -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/>.
+ */
+
 import org.gradle.internal.jvm.*
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.apache.tools.ant.taskdefs.condition.Os

build.gradle.kts

@@ -20,7 +20,7 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
-import com.lambda.event.events.ScreenHandlerEvent;
+import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
@@ -78,15 +78,15 @@ private void onStartup(CallbackInfo ci) {
     private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
         if (screen == null) return;
         if (screen instanceof ScreenHandlerProvider<?> handledScreen) {
-            EventFlow.post(new ScreenHandlerEvent.Open(handledScreen.getScreenHandler()));
+            EventFlow.post(new InventoryEvent.Open(handledScreen.getScreenHandler()));
         }
     }
 
     @Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;removed()V", shift = At.Shift.AFTER))
     private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
         if (currentScreen == null) return;
         if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {
-            EventFlow.post(new ScreenHandlerEvent.Close(handledScreen.getScreenHandler()));
+            EventFlow.post(new InventoryEvent.Close(handledScreen.getScreenHandler()));
         }
     }
 

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

@@ -28,7 +28,7 @@
 
 @Mixin(SoundSystem.class)
 public class SoundSystemMixin {
-    @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At("HEAD"), cancellable = true)
     public void onPlay(SoundInstance sound, CallbackInfo ci) {
         if (EventFlow.post(new ClientEvent.Sound(sound)).isCanceled()) {
             ci.cancel();

common/src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java

@@ -19,7 +19,6 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.PlayerEvent;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import net.minecraft.entity.Entity;
@@ -31,7 +30,6 @@
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-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;
@@ -66,9 +64,11 @@ public void interactItemHead(PlayerEntity player, Hand hand, CallbackInfoReturna
         }
     }
 
-    @Inject(method = "attackBlock", at = @At("HEAD"))
+    @Inject(method = "attackBlock", at = @At("HEAD"), cancellable = true)
     public void onAttackBlock(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new PlayerEvent.Attack.Block(pos, side)).isCanceled()) cir.cancel();
+        if (EventFlow.post(new PlayerEvent.Attack.Block(pos, side)).isCanceled()) {
+            cir.setReturnValue(false);
+        }
     }
 
     @Inject(method = "attackEntity", at = @At("HEAD"), cancellable = true)

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

@@ -19,14 +19,15 @@
 
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.MovementEvent;
+import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
 import com.lambda.interaction.RotationManager;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
+import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -124,4 +125,11 @@ float fixHeldItemPitch(ClientPlayerEntity instance) {
     void onSwingHandPre(Hand hand, CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
+
+    @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
+    public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
+        if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) {
+            cir.setReturnValue(false);
+        }
+    }
 }

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

@@ -19,12 +19,13 @@
 
 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;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.MovementType;
+import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -33,6 +34,7 @@
 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(Entity.class)
 public abstract class EntityMixin {
@@ -94,6 +96,16 @@ private void changeLookDirection(double cursorDeltaX, double cursorDeltaY, Callb
     public void onTrackedDataSet(TrackedData<?> data, CallbackInfo ci) {
         Entity entity = (Entity) (Object) this;
 
-        EventFlow.post(new WorldEvent.EntityUpdate(entity, data));
+        EventFlow.post(new EntityEvent.EntityUpdate(entity, data));
+    }
+
+    // ToDo: Does not trigger for some reason.
+    @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
+    public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
+        Entity entity = (Entity) (Object) this;
+
+        if (EventFlow.post(new EntityEvent.Damage(entity, source, amount)).isCanceled()) {
+            cir.setReturnValue(false);
+        }
     }
 }