Merge pull request #279 from nexusnode/bugfixes

Kill feed includes dehydration, hunger, fall, self damage, etc
nexusnode · Mar 16, 2024 · 6d52bce · 6d52bce
2 parents 331a689 + 77a80e4
commit 6d52bce
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 1 deletion.
diff --git a/...d-immerse/src/main/java/com/craftingdead/immerse/game/survival/SurvivalPlayerHandler.java b/...d-immerse/src/main/java/com/craftingdead/immerse/game/survival/SurvivalPlayerHandler.java
@@ -24,13 +24,22 @@
 import java.util.UUID;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.Nullable;
+
+import com.craftingdead.core.CraftingDead;
 import com.craftingdead.core.network.SynchedData;
 import com.craftingdead.core.world.entity.extension.LivingHandlerType;
 import com.craftingdead.core.world.entity.extension.PlayerExtension;
 import com.craftingdead.core.world.entity.extension.PlayerHandler;
+import com.craftingdead.core.world.entity.grenade.FragGrenade;
+import com.craftingdead.core.world.entity.grenade.Grenade;
+import com.craftingdead.core.world.item.GrenadeItem;
+import com.craftingdead.core.world.item.ModItems;
 import com.craftingdead.immerse.CraftingDeadImmerse;
 import com.craftingdead.immerse.event.WaterDecayEvent;
+import com.craftingdead.immerse.network.NetworkChannel;
+import com.craftingdead.immerse.network.play.AddKillFeedEntryMessage;
 import com.craftingdead.immerse.world.ImmerseDamageSource;
+import com.craftingdead.immerse.world.KillFeedEntry;
 import com.craftingdead.immerse.world.level.extension.LegacyBase;
 import com.craftingdead.immerse.world.level.extension.LevelExtension;
 import net.minecraft.core.BlockPos;
@@ -43,11 +52,16 @@
 import net.minecraft.stats.Stats;
 import net.minecraft.util.Mth;
 import net.minecraft.world.Difficulty;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.BlockSnapshot;
+import net.minecraftforge.network.PacketDistributor;
 
 public class SurvivalPlayerHandler implements PlayerHandler {
 
@@ -147,6 +161,45 @@ public boolean handleKill(Entity target) {
     return false;
   }
 
+  @Override
+  public boolean handleDeath(DamageSource cause) {
+
+    System.out.println(cause.getDirectEntity());
+    System.out.println(cause.getEntity());
+
+    Entity attackItemEntity = cause.getDirectEntity();
+    Entity attacker = cause.getEntity();
+    Entity entityPlayer = this.player.entity();
+
+    if(attacker.getStringUUID().equalsIgnoreCase(entityPlayer.getStringUUID())){
+      if(attackItemEntity instanceof Grenade) {
+        NetworkChannel.PLAY.getSimpleChannel().send(PacketDistributor.ALL.noArg(),
+            new AddKillFeedEntryMessage(new KillFeedEntry((LivingEntity) entityPlayer,
+                entityPlayer, new ItemStack(ModItems.FRAG_GRENADE.get()),
+                KillFeedEntry.Type.GRENADE)));
+      } else {
+        NetworkChannel.PLAY.getSimpleChannel().send(PacketDistributor.ALL.noArg(),
+            new AddKillFeedEntryMessage(new KillFeedEntry((LivingEntity) entityPlayer,
+                entityPlayer, this.player.mainHandItem(),
+                KillFeedEntry.Type.SUICIDE))); 
+      }
+    }
+
+    if(cause == ImmerseDamageSource.DEHYDRATION || cause == ImmerseDamageSource.HUNGER) {
+      NetworkChannel.PLAY.getSimpleChannel().send(PacketDistributor.ALL.noArg(),
+          new AddKillFeedEntryMessage(new KillFeedEntry((LivingEntity) entityPlayer,
+              entityPlayer, this.player.mainHandItem(),
+              cause == ImmerseDamageSource.DEHYDRATION ? KillFeedEntry.Type.DEHYDRATION : KillFeedEntry.Type.HUNGER)));
+    }
+    if(cause == DamageSource.FALL) {
+      NetworkChannel.PLAY.getSimpleChannel().send(PacketDistributor.ALL.noArg(),
+          new AddKillFeedEntryMessage(new KillFeedEntry((LivingEntity) entityPlayer,
+              entityPlayer, this.player.mainHandItem(),
+              KillFeedEntry.Type.FALL)));
+    }
+    return PlayerHandler.super.handleDeath(cause);
+  }
+
   public int getDaysSurvived() {
     return this.dataManager.get(DAYS_SURVIVED);
   }
@@ -285,4 +338,6 @@ public void decode(FriendlyByteBuf in) {
   public boolean requiresSync() {
     return this.dataManager.isDirty();
   }
+
+
 }
diff --git a/crafting-dead-immerse/src/main/java/com/craftingdead/immerse/world/ImmerseDamageSource.java b/crafting-dead-immerse/src/main/java/com/craftingdead/immerse/world/ImmerseDamageSource.java
@@ -24,4 +24,8 @@ public class ImmerseDamageSource {
 
   public static final DamageSource DEHYDRATION =
       new DamageSource("dehydration").bypassArmor();
+
+  public static final DamageSource HUNGER =
+      new DamageSource("hunger").bypassArmor();
+
 }
diff --git a/crafting-dead-immerse/src/main/java/com/craftingdead/immerse/world/KillFeedEntry.java b/crafting-dead-immerse/src/main/java/com/craftingdead/immerse/world/KillFeedEntry.java
@@ -54,6 +54,6 @@ public static KillFeedEntry decode(FriendlyByteBuf in) {
 
   public enum Type {
 
-    NONE, HEADSHOT, WALLBANG, WALLBANG_HEADSHOT;
+    NONE, HEADSHOT, WALLBANG, WALLBANG_HEADSHOT, DEHYDRATION, HUNGER, FALL, SUICIDE, GRENADE;
   }
 }