Fixed lightning and oxidation

Author: Faboslav

CHANGELOG.md

@@ -6,7 +6,7 @@
 - Fixed illusioner having invisible bow
 - Fixed villagers not running from illusioners
 - Fixed lightning rods lightning bolt attraction
-- Fixed lightning rods oxidation
+- Fixed all oxidation cases related to lightning bolts and lightning rods
 - Corrected multiple data tags
 
 ## 4.0.10

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/LightningEntityMixin.java

@@ -1,16 +1,10 @@
 package com.faboslav.friendsandfoes.common.mixin;
 
-import com.faboslav.friendsandfoes.common.FriendsAndFoes;
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.world.entity.LightningBolt;
+import org.spongepowered.asm.mixin.Mixin;
 
 //? if <=1.21.8 {
-import com.faboslav.friendsandfoes.common.block.FriendsAndFoesOxidizable;
-import com.faboslav.friendsandfoes.common.tag.FriendsAndFoesTags;
 import org.spongepowered.asm.mixin.Shadow;
-
 import net.minecraft.world.entity.Entity;
 import java.util.Optional;
 import net.minecraft.core.BlockPos;
@@ -19,6 +13,12 @@
 import net.minecraft.world.level.block.LightningRodBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Unique;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.WeatheringCopper;
+import com.faboslav.friendsandfoes.common.block.FriendsAndFoesOxidizable;
+import com.faboslav.friendsandfoes.common.tag.FriendsAndFoesTags;
 
 @Mixin(LightningBolt.class)
 public abstract class LightningEntityMixin extends Entity
@@ -40,9 +40,10 @@ public LightningEntityMixin(EntityType<?> type, Level world) {
 
 		BlockPos blockPos = this.getStrikePosition();
 		BlockState blockState = this.level().getBlockState(blockPos);
+		Block block = blockState.getBlock();
 
 		if (blockState.is(FriendsAndFoesTags.LIGHTNING_RODS)) {
-			((LightningRodBlock) this.level().getBlockState(blockPos).getBlock()).onLightningStrike(blockState, this.level(), blockPos);
+			((LightningRodBlock)block).onLightningStrike(blockState, this.level(), blockPos);
 		}
 	}
 
@@ -54,12 +55,16 @@ public LightningEntityMixin(EntityType<?> type, Level world) {
 		BlockPos blockPos,
 		Operation<Void> original
 	) {
+		original.call(level, blockPos);
+
 		BlockState blockState = level.getBlockState(blockPos);
+		Block block = blockState.getBlock();
 
-		if (blockState.is(FriendsAndFoesTags.LIGHTNING_RODS)) {
-			FriendsAndFoes.getLogger().info("should deoxidize to " + FriendsAndFoesOxidizable.getFirst(blockState));
+		if (blockState.is(FriendsAndFoesTags.LIGHTNING_RODS) || blockState.is(FriendsAndFoesTags.COPPER_BUTTONS)) {
 			level.setBlockAndUpdate(blockPos, FriendsAndFoesOxidizable.getFirst(level.getBlockState(blockPos)));
+		}
 
+		if((block instanceof WeatheringCopper && !blockState.is(FriendsAndFoesTags.LIGHTNING_RODS)) || blockState.is(FriendsAndFoesTags.COPPER_BUTTONS)) {
 			BlockPos.MutableBlockPos mutableBlockPos = blockPos.mutable();
 			int i = level.random.nextInt(3) + 3;
 
@@ -90,11 +95,19 @@ public LightningEntityMixin(EntityType<?> type, Level world) {
 	private static Optional<BlockPos> friendsandfoes$randomStepCleaningCopper(Level level, BlockPos pos) {
 		for(BlockPos blockPos : BlockPos.randomInCube(level.random, 10, pos, 1)) {
 			BlockState blockState = level.getBlockState(blockPos);
-			if (blockState.getBlock() instanceof FriendsAndFoesOxidizable) {
+			Block block = blockState.getBlock();
+
+			if (blockState.is(FriendsAndFoesTags.LIGHTNING_RODS) || blockState.is(FriendsAndFoesTags.COPPER_BUTTONS)) {
 				FriendsAndFoesOxidizable.getPrevious(blockState).ifPresent((blockStatex) -> level.setBlockAndUpdate(blockPos, blockStatex));
 				level.levelEvent(3002, blockPos, -1);
 				return Optional.of(blockPos);
 			}
+
+			if (block instanceof WeatheringCopper) {
+				WeatheringCopper.getPrevious(blockState).ifPresent((blockStatex) -> level.setBlockAndUpdate(blockPos, blockStatex));
+				level.levelEvent(3002, blockPos, -1);
+				return Optional.of(blockPos);
+			}
 		}
 
 		return Optional.empty();

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/ServerWorldMixin.java

@@ -3,7 +3,6 @@
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
 import com.faboslav.friendsandfoes.common.entity.ZombieHorseEntityAccess;
 import com.faboslav.friendsandfoes.common.tag.FriendsAndFoesTags;
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.core.BlockPos;
@@ -27,10 +26,6 @@
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-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;
 
 import java.util.Optional;
 
@@ -143,7 +138,6 @@ protected ServerWorldMixin(
 			return originalLightningRodPos;
 		}
 
-		FriendsAndFoes.getLogger().info("Trying to find lightning rod at" + pos);
 		ServerLevel serverWorld = (ServerLevel) (Object) this;
 
 		Optional<BlockPos> optional = serverWorld.getPoiManager().findClosest((registryEntry) -> {
@@ -152,13 +146,6 @@ protected ServerWorldMixin(
 			return posx.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, posx.getX(), posx.getZ()) - 1;
 		}, pos, 128, PoiManager.Occupancy.ANY);
 
-		var value = optional.map((posx) -> posx.above(1));
-
-		if(value.isPresent()) {
-			FriendsAndFoes.getLogger().info("Found: " + value.get());
-		} else {
-			FriendsAndFoes.getLogger().info("Cant find");
-		}
-		return value;
+		return optional.map((posx) -> posx.above(1));
 	}
 }