Concise entity event naming

Author: emyfops

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

@@ -130,7 +130,7 @@ private void changeLookDirection(double cursorDeltaX, double cursorDeltaY, Callb
     @Inject(method = "onTrackedDataSet(Lnet/minecraft/entity/data/TrackedData;)V", at = @At("TAIL"))
     public void onTrackedDataSet(TrackedData<?> data, CallbackInfo ci) {
         Entity entity = (Entity) (Object) this;
-        EventFlow.post(new EntityEvent.EntityUpdate(entity, data));
+        EventFlow.post(new EntityEvent.Update(entity, data));
     }
 
     // ToDo: Does not trigger for some reason.

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

@@ -23,12 +23,8 @@
 import com.lambda.module.modules.render.WorldColors;
 import com.lambda.util.math.ColorKt;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -37,20 +33,18 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.function.Supplier;
-
 @Mixin(ClientWorld.class)
 public class ClientWorldMixin {
     @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
     private void onAddEntity(Entity entity, CallbackInfo ci) {
-        if (EventFlow.post(new EntityEvent.EntitySpawn(entity)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new EntityEvent.Spawn(entity)).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "removeEntity", at = @At("HEAD"))
     private void onRemoveEntity(int entityId, Entity.RemovalReason removalReason, CallbackInfo ci) {
         Entity entity = ((ClientWorld) (Object) this).getEntityById(entityId);
         if (entity == null) return;
-        EventFlow.post(new EntityEvent.EntityRemoval(entity, removalReason));
+        EventFlow.post(new EntityEvent.Removal(entity, removalReason));
     }
 
     @Inject(method = "getCloudsColor", at = @At("HEAD"), cancellable = true)

common/src/main/kotlin/com/lambda/event/events/EntityEvent.kt

@@ -50,7 +50,7 @@ sealed class EntityEvent {
      *
      * @property entity The entity that is being spawned.
      */
-    data class EntitySpawn(
+    data class Spawn(
         val entity: Entity,
     ) : ICancellable by Cancellable()
 
@@ -60,7 +60,7 @@ sealed class EntityEvent {
      * @property entity The entity being removed from the world.
      * @property removalReason The reason for the removal of the entity.
      */
-    data class EntityRemoval(
+    data class Removal(
         val entity: Entity,
         val removalReason: Entity.RemovalReason,
     ) : Event
@@ -74,8 +74,8 @@ sealed class EntityEvent {
      * @property entity The entity whose tracked data is being updated.
      * @property data The tracked data being updated.
      */
-    data class EntityUpdate(
+    data class Update(
         val entity: Entity,
         val data: TrackedData<*>,
     ) : Event
-}
+}

common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt

@@ -40,6 +40,7 @@ import com.lambda.threading.runSafe
 import com.lambda.threading.runSafeGameScheduled
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.Communication.info
+import com.lambda.util.PacketUtils.sendPacket
 import com.lambda.util.Timer
 import com.lambda.util.collections.LimitedDecayQueue
 import com.lambda.util.combat.CombatUtils.crystalDamage
@@ -188,13 +189,13 @@ object CrystalAura : Module(
         }
 
         // Update last received entity spawn
-        listen<EntityEvent.EntitySpawn>(alwaysListen = true) { event ->
+        listen<EntityEvent.Spawn>(alwaysListen = true) { event ->
             lastEntityId = event.entity.id
             predictionTimer.reset()
         }
 
         // Prediction
-        listen<EntityEvent.EntitySpawn> { event ->
+        listen<EntityEvent.Spawn> { event ->
             val crystal = event.entity as? EndCrystalEntity ?: return@listen
             val pos = crystal.baseBlockPos
 
@@ -217,7 +218,7 @@ object CrystalAura : Module(
             if (placePostPause) placeTimer.reset()
         }
 
-        listen<EntityEvent.EntityRemoval> { event ->
+        listen<EntityEvent.Removal> { event ->
             val crystal = event.entity as? EndCrystalEntity ?: return@listen
             val pos = crystal.baseBlockPos
 
@@ -272,21 +273,21 @@ object CrystalAura : Module(
     }
 
     private fun SafeContext.placeInternal(opportunity: Opportunity, hand: Hand) {
-        connection.sendPacket(
+        connection.sendPacket {
             PlayerInteractBlockC2SPacket(
                 hand, BlockHitResult(opportunity.crystalPosition, opportunity.side, opportunity.blockPos, false), 0
             )
-        )
+        }
 
         player.swingHand(hand)
     }
 
     private fun SafeContext.explodeInternal(id: Int) {
-        connection.sendPacket(
+        connection.sendPacket {
             PlayerInteractEntityC2SPacket(
                 id, player.isSneaking, PlayerInteractEntityC2SPacket.ATTACK
             )
-        )
+        }
 
         player.swingHand(Hand.MAIN_HAND)
     }

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -47,8 +47,6 @@ import com.lambda.interaction.material.transfer.TransactionExecutor.Companion.tr
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.task.Task
 import com.lambda.util.BaritoneUtils
-import com.lambda.util.BlockUtils
-import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.Communication.info
 import com.lambda.util.Communication.warn
 import com.lambda.util.Formatting.string
@@ -237,7 +235,7 @@ class BuildTask @Ta5kBuilder constructor(
         }
 
         // ToDo: Dependent on the tracked data order. When set stack is called after position it wont work
-        listen<EntityEvent.EntityUpdate> {
+        listen<EntityEvent.Update> {
             if (!collectDrops) return@listen
             if (it.entity !is ItemEntity) return@listen
             pendingInteractions.find { context ->