lightningproof golems

Author: cassiancc

gradle.properties

@@ -4,7 +4,7 @@ loom.platform = forge
 org.gradle.vfs.watch=true
 
 # Mod properties
-mod_version = 1.11-pre12
+mod_version = 1.11-pre13
 maven_group = cc.cassian.raspberry
 archives_name = raspberry_core
 

src/main/java/cc/cassian/raspberry/RaspberryMod.java

@@ -111,6 +111,8 @@ public static void lightningTick(EntityStruckByLightningEvent event) {
         if (!ModCompat.hasCofhCore() && ModConfig.get().aftershock) {
             AftershockEvent.electrify(event);
         }
+        if (ModCompat.hasCopperAgeBackport())
+            CopperAgeBackportCompat.saveCopperGolem(event);
     }
 
     @SubscribeEvent

src/main/java/cc/cassian/raspberry/compat/CopperAgeBackportCompat.java

@@ -1,19 +1,23 @@
 package cc.cassian.raspberry.compat;
 
 import cc.cassian.raspberry.mixin.copperagebackport.CopperGolemEntityAccessor;
+import cc.cassian.raspberry.registry.RaspberryMobEffects;
 import com.github.smallinger.copperagebackport.ModMemoryTypes;
 import com.github.smallinger.copperagebackport.entity.CopperGolemEntity;
 import com.github.smallinger.copperagebackport.registry.ModEntities;
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import com.teamabnormals.caverns_and_chasms.core.other.tags.CCBlockTags;
 import com.teamabnormals.caverns_and_chasms.core.registry.CCBlocks;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.CarvedPumpkinBlock;
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
+import net.minecraftforge.eventbus.api.Event;
 
 public class CopperAgeBackportCompat {
 	public static void spawnCopperGolem(Level level, BlockPos pos, LocalRef<LivingEntity> golem, float yRot, BlockState abovestate) {
@@ -38,4 +42,14 @@ public static void spawnCopperGolem(Level level, BlockPos pos, LocalRef<LivingEn
 		golem.set(copperGolem);
 		copperGolem.moveTo((double)pos.getX() + (double)0.5F, (double)pos.getY() + 0.05, (double)pos.getZ() + (double)0.5F, yRot, 0.0F);
 	}
+
+	public static void saveCopperGolem(EntityStruckByLightningEvent event) {
+		if (event.getEntity() instanceof CopperGolemEntity) {
+			event.setCanceled(true);
+		}
+	}
+
+	public static boolean isCopperGolem(LivingEntity entity) {
+		return entity instanceof CopperGolemEntity;
+	}
 }

src/main/java/cc/cassian/raspberry/events/AftershockEvent.java

@@ -1,6 +1,7 @@
 package cc.cassian.raspberry.events;
 
 import cc.cassian.raspberry.ModCompat;
+import cc.cassian.raspberry.compat.CopperAgeBackportCompat;
 import cc.cassian.raspberry.registry.RaspberryMobEffects;
 import cc.cassian.raspberry.registry.RaspberryTags;
 import cofh.core.init.CoreMobEffects;
@@ -11,6 +12,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
+import org.jetbrains.annotations.Nullable;
 
 public class AftershockEvent {
 
@@ -20,14 +22,8 @@ public class AftershockEvent {
      */
     public static void electrify(EntityStruckByLightningEvent event) {
         Entity entity = event.getEntity();
-        int copperCount = 0;
         if (entity instanceof LivingEntity player) {
-            for (ItemStack armorSlot : entity.getArmorSlots()) {
-                if (armorSlot.is(RaspberryTags.COPPER_ARMOR)) {
-                    copperCount++;
-                }
-            }
-            copperCount--;
+            int copperCount = getCopperCount(player);
             if (copperCount >= 0) {
                 if (!ModCompat.hasCofhCore())
                     player.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 20, copperCount, false, false, false));
@@ -42,18 +38,26 @@ public static void electrify(EntityStruckByLightningEvent event) {
      * Implemented via mixin.
      */
     public static void resist(LivingEntity entity) {
+        int copperCount = getCopperCount(entity);
+        if (copperCount >= 0) {
+            entity.addEffect(new MobEffectInstance(CoreMobEffects.LIGHTNING_RESISTANCE.get(), 202, 0, false, false, true));
+        }
+    }
+
+    private static int getCopperCount(LivingEntity entity) {
         int copperCount = 0;
         if (entity instanceof Player player && player.isLocalPlayer()) {
-            return;
+            return 0;
         }
         for (ItemStack armorSlot : entity.getArmorSlots()) {
             if (armorSlot.is(RaspberryTags.COPPER_ARMOR)) {
                 copperCount++;
             }
         }
         copperCount--;
-        if (copperCount >= 0) {
-            entity.addEffect(new MobEffectInstance(CoreMobEffects.LIGHTNING_RESISTANCE.get(), 202, 0, false, false, true));
+        if (ModCompat.hasCopperAgeBackport() && CopperAgeBackportCompat.isCopperGolem(entity)) {
+            copperCount = 2;
         }
+        return copperCount;
     }
 }