Merge pull request #96 from LukeisStuff/8.0

fix client crash when you die, fix drowning string and add a death cause for acid

Author: MartinSVK12

CHANGELOG.md

@@ -1 +1,2 @@
-- Make the client not crash instantly due to trying to load server classes.
+- Client no longer crashes when dying.
+- Fix drowning death cause lang and add acid death cause

README.md

@@ -15,7 +15,7 @@ Follow the setup instructions on [the example mod](https://github.com/Turnip-Lab
 Update the ``/gradle/libs.versions.toml`` config file:
 ```toml
 [versions]
-halplibe = "6.0.2"
+halplibe = "6.1.4+8.0"
 
 [libraries]
 halplibe = { group = "turniplabs", name = "halplibe", version.ref = "halplibe" }

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.warning.mode = all
 org.gradle.configuration-cache = false
 ##########################################################################
 # Mod Properties
-mod_version = 6.1.3
+mod_version = 6.1.4
 mod_group = turniplabs
 mod_name = halplibe
 ##########################################################################

src/main/java/turniplabs/halplibe/helper/network/NetworkHandler.java

@@ -86,8 +86,11 @@ public static void internalSendHandshakeAck(@NonNull PacketHandlerClient packetH
     /**
      * Whether the given Player's client confirmed it can decode the native UniversalPacket.
      */
-    @Environment(EnvType.SERVER)
     public static boolean canReceiveNativePackets(Player player) {
+        if (EnvironmentHelper.isSingleplayerClient() || !EnvironmentHelper.isMultiplayerServer()) {
+            return true;
+        }
+
         return player instanceof PlayerServer playerServer
                 && nativeReadyConnections.contains(playerServer.playerNetServerHandler);
     }

src/main/java/turniplabs/halplibe/mixin/deathcause/MobMixin.java

@@ -53,8 +53,8 @@ public void hijackDeathMessage(
 
                 // the projectile death message only triggers if one or both of the entities is a player.
                 if (entityKilledBy instanceof Projectile projectile) {
-                    if (thisAs instanceof Player) {
-                        this.deathCause = new DeathCauseProjectile((Player) thisAs, projectile);
+                    if (thisAs instanceof Player player) {
+                        this.deathCause = new DeathCauseProjectile(player, projectile);
                     }
 
                     // so if a skeleton shoots down your dog, just mark it as a skelie.
@@ -68,6 +68,10 @@ else if (thisAs.isInLava()) {
                 this.deathCause = new DeathCauseRegistry.DeathCauseLava(thisAs);
             }
 
+            else if (thisAs.isInAcid()) {
+                this.deathCause = new DeathCauseRegistry.DeathCauseAcid(thisAs);
+            }
+
             else {
                 TilePos tilePos = new TilePos(thisAs);
 

src/main/java/turniplabs/halplibe/util/deathcause/DeathCause.java

@@ -35,12 +35,13 @@ public abstract class DeathCause {
     protected boolean isPlayer = false;
     protected EntityName victim = EntityName.empty();
 
-    public DeathCause() {};
+    public DeathCause() {
+    }
 
     public DeathCause(Mob victim) {
         this.isPlayer = victim instanceof Player;
         this.victim = EntityName.fromEntity(victim);
-    };
+    }
 
     public void serialize(CompoundTag tag) {
         var victimTag = new CompoundTag();

src/main/java/turniplabs/halplibe/util/deathcause/DeathCauseRegistry.java

@@ -48,13 +48,14 @@ public String getKeyForClass(Class<? extends DeathCause> clazz) {
     static {
         var inst = getInstance();
 
-        inst.register("halplibe:drown", DeathCauseDrown::new);
+        inst.register("halplibe:drowned", DeathCauseDrown::new);
         inst.register("halplibe:fall", DeathCauseFall::new);
         inst.register("halplibe:fire", DeathCauseFire::new);
         inst.register("halplibe:generic", DeathCauseGeneric::new);
         inst.register("halplibe:killed_by", DeathCauseKilledBy::new);
         inst.register("halplibe:projectile", DeathCauseProjectile::new);
         inst.register("halplibe:lava", DeathCauseLava::new);
+        inst.register("halplibe:acid", DeathCauseAcid::new);
         inst.register("halplibe:spikes", DeathCauseSpikes::new);
         inst.register("halplibe:herobrine", DeathCauseHerobrine::new);
     }
@@ -65,7 +66,7 @@ public static class DeathCauseDrown extends DeathCause {
 
         @Override
         protected String getTranslationKeyShard() {
-            return "drown";
+            return "drowned";
         }
     }
 
@@ -110,6 +111,16 @@ protected String getTranslationKeyShard() {
         }
     }
 
+    public static class DeathCauseAcid extends DeathCause {
+        public DeathCauseAcid(Mob mob) { super(mob); }
+        public DeathCauseAcid() { super(); }
+
+        @Override
+        protected String getTranslationKeyShard() {
+            return "acid";
+        }
+    }
+
     public static class DeathCauseSpikes extends DeathCause {
         public DeathCauseSpikes(Mob mob) { super(mob); }
         public DeathCauseSpikes() { super(); }