fix: hook additional methods for a better chance to catch damage

src/main/java/io/gitlab/jfronny/breakme/BreakMe.java

@@ -15,14 +15,24 @@ public class BreakMe implements ModInitializer {
         LOGGER.warn("Prepare for trouble");
     }
 
-    public static void tryInvokeCrash(PlayerEntity player) throws Exception {
-        if (BreakMeConfig.event == BreakMeConfig.Cause.All
-                || BreakMeConfig.event == BreakMeConfig.Cause.Damage
-                || (BreakMeConfig.event == BreakMeConfig.Cause.Death && player.isDead())) {
-            Method method = BreakMeConfig.method;
-            String name = Language.getInstance().get(MOD_ID + ".jfconfig.enum.Method." + method.name(), method.name());
-            LOGGER.info("Invoking the crash (using " + name + ")");
-            method.crash();
+    public static void tryInvokeCrash(BreakMeConfig.Cause cause) throws Exception {
+        if (BreakMeConfig.event.includes(cause)) {
+            crash();
         }
     }
+
+    public static BreakMeConfig.Cause resolveEvent(PlayerEntity player) {
+        if (player.isDead()) {
+            return BreakMeConfig.Cause.Death;
+        } else {
+            return BreakMeConfig.Cause.Damage;
+        }
+    }
+
+    private static void crash() throws Exception {
+        Method method = BreakMeConfig.method;
+        String name = Language.getInstance().get(MOD_ID + ".jfconfig.enum.Method." + method.name(), method.name());
+        LOGGER.info("Invoking the crash (using " + name + ")");
+        method.crash();
+    }
 }

src/main/java/io/gitlab/jfronny/breakme/BreakMeConfig.java

@@ -13,7 +13,12 @@ public class BreakMeConfig {
         Death,
 
         All,
-        None
+        None;
+
+        public boolean includes(Cause cause) {
+            if (cause == null || cause == None) return false;
+            return this == All || this == cause;
+        }
     }
 
     @Verifier
@@ -24,6 +29,14 @@ public class BreakMeConfig {
         }
     }
 
+    @Verifier
+    public static void validEvent() {
+        if (BreakMeConfig.event == null) {
+            BreakMeConfig.event = Cause.None;
+            BreakMe.LOGGER.error("Could not find specified event, defaulting to None");
+        }
+    }
+
     static {
         JFC_BreakMeConfig.ensureInitialized();
     }

src/main/java/io/gitlab/jfronny/breakme/mixin/LivingEntityMixin.java

@@ -0,0 +1,21 @@
+package io.gitlab.jfronny.breakme.mixin;
+
+import io.gitlab.jfronny.breakme.BreakMe;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.player.PlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LivingEntity.class)
+public class LivingEntityMixin {
+    // client-side damage event when playing on a server
+    @Inject(at = @At("TAIL"), method = "onDamaged(Lnet/minecraft/entity/damage/DamageSource;)V")
+    private void onDamage(DamageSource damageSource, CallbackInfo ci) throws Exception {
+        if (((LivingEntity)(Object)this) instanceof PlayerEntity player) {
+            BreakMe.tryInvokeCrash(BreakMe.resolveEvent(player));
+        }
+    }
+}

src/main/java/io/gitlab/jfronny/breakme/mixin/PlayerEntityMixin.java

@@ -1,19 +1,26 @@
 package io.gitlab.jfronny.breakme.mixin;
 
 import io.gitlab.jfronny.breakme.BreakMe;
+import io.gitlab.jfronny.breakme.BreakMeConfig;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerEntity.class)
-public class MixinPlayerEntity {
+public class PlayerEntityMixin {
     @Inject(at = @At("TAIL"), method = "damage(Lnet/minecraft/entity/damage/DamageSource;F)Z")
     private void onDamage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> info) throws Exception {
         if (info.getReturnValue()) {
-            BreakMe.tryInvokeCrash((PlayerEntity)(Object)this);
+            BreakMe.tryInvokeCrash(BreakMe.resolveEvent((PlayerEntity)(Object)this));
         }
     }
+
+    @Inject(at = @At("TAIL"), method = "onDeath(Lnet/minecraft/entity/damage/DamageSource;)V")
+    private void onDeath(DamageSource damageSource, CallbackInfo ci) throws Exception {
+        BreakMe.tryInvokeCrash(BreakMeConfig.Cause.Death);
+    }
 }

src/main/resources/breakme.mixins.json

@@ -4,9 +4,10 @@
   "package": "io.gitlab.jfronny.breakme.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "MixinPlayerEntity"
+    "PlayerEntityMixin"
   ],
   "client": [
+    "LivingEntityMixin"
   ],
   "injectors": {
     "defaultRequire": 1