From 5d5acf253be5f8cb148dc43ac8488ad26e3088f8 Mon Sep 17 00:00:00 2001
From: WinDanesz <31292708+WinDanesz@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:49:21 +0200
Subject: [PATCH] feat: Fireskin burns away cobweb blocks on contact

---
 .../wizardry/potion/PotionFireskin.java       | 97 +++++++++++++++++++
 .../wizardry/registry/WizardryPotions.java    | 16 +--
 2 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/electroblob/wizardry/potion/PotionFireskin.java

diff --git a/src/main/java/electroblob/wizardry/potion/PotionFireskin.java b/src/main/java/electroblob/wizardry/potion/PotionFireskin.java
new file mode 100644
index 00000000..6d800df1
--- /dev/null
+++ b/src/main/java/electroblob/wizardry/potion/PotionFireskin.java
@@ -0,0 +1,97 @@
+package electroblob.wizardry.potion;
+
+import electroblob.wizardry.registry.WizardrySounds;
+import net.minecraft.init.SoundEvents;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class PotionFireskin extends PotionMagicEffectParticles {
+
+	public PotionFireskin(boolean isBadEffect, int liquidColour, ResourceLocation texture) {
+		super(isBadEffect, liquidColour, texture);
+		this.setBeneficial();
+	}
+
+	@Override
+	public void spawnCustomParticle(World world, double x, double y, double z){
+		if(world.isRemote){
+			// Spawn ambient fire particles around the entity
+			world.spawnParticle(EnumParticleTypes.FLAME, x, y, z, 0, 0, 0);
+		}
+	}
+
+	@Override
+	public boolean isReady(int duration, int amplifier) {
+		return true;
+	}
+
+	@Override
+	public void performEffect(EntityLivingBase entitylivingbase, int strength){
+
+		// Original fireskin behavior: extinguish the entity to prevent fire damage from melee attacks
+		entitylivingbase.extinguish();
+
+		// Server-side cobweb burning logic
+		World world = entitylivingbase.world;
+		if(!world.isRemote){
+
+			AxisAlignedBB entityBox = entitylivingbase.getEntityBoundingBox();
+
+			// Expand the bounding box slightly to catch cobwebs the entity is touching
+			entityBox = entityBox.expand(0.1, 0.1, 0.1);
+
+			BlockPos minPos = new BlockPos(entityBox.minX, entityBox.minY, entityBox.minZ);
+			BlockPos maxPos = new BlockPos(entityBox.maxX, entityBox.maxY, entityBox.maxZ);
+
+			boolean burnedCobweb = false;
+
+			// Check all blocks in the entity's bounding box
+			for(int x = minPos.getX(); x <= maxPos.getX(); x++){
+				for(int y = minPos.getY(); y <= maxPos.getY(); y++){
+					for(int z = minPos.getZ(); z <= maxPos.getZ(); z++){
+
+						BlockPos pos = new BlockPos(x, y, z);
+
+						if(world.getBlockState(pos).getBlock() == Blocks.WEB){
+							// Burn the cobweb
+							world.setBlockToAir(pos);
+							burnedCobweb = true;
+
+							// Add visual effects - spawn particles on client side
+							if(world.rand.nextFloat() < 0.7f){ // 70% chance to spawn particles for better visibility
+								float offsetX = world.rand.nextFloat() * 0.1f - 0.05f;
+								float offsetY = world.rand.nextFloat() * 0.1f + 0.05f;
+								float offsetZ = world.rand.nextFloat() * 0.1f - 0.05f;
+
+								// Main flame particle rising up
+								world.spawnParticle(EnumParticleTypes.FLAME,
+									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
+									0, 0.1, 0);
+
+								// Two additional flame particles with random movement
+								world.spawnParticle(EnumParticleTypes.FLAME,
+									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
+									offsetX, offsetY, offsetZ);
+
+								world.spawnParticle(EnumParticleTypes.FLAME,
+									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
+									offsetX * -0.5f, offsetY * 0.8f, offsetZ * -0.5f);
+							}
+						}
+					}
+				}
+			}
+
+			// Play the fire extinguish sound only when cobwebs were actually burned
+			if(burnedCobweb){
+				world.playSound(null, entitylivingbase.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.6f, 0.8f + world.rand.nextFloat() * 0.4f);
+			}
+		}
+	}
+}
diff --git a/src/main/java/electroblob/wizardry/registry/WizardryPotions.java b/src/main/java/electroblob/wizardry/registry/WizardryPotions.java
index fdc13cc4..a62721c7 100644
--- a/src/main/java/electroblob/wizardry/registry/WizardryPotions.java
+++ b/src/main/java/electroblob/wizardry/registry/WizardryPotions.java
@@ -2,6 +2,7 @@ package electroblob.wizardry.registry;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.potion.*;
+import electroblob.wizardry.potion.PotionFireskin;
 import electroblob.wizardry.util.ParticleBuilder;
 import electroblob.wizardry.util.ParticleBuilder.Type;
 import net.minecraft.entity.EntityLivingBase;
@@ -95,19 +96,8 @@ public final class WizardryPotions {
 			}
 		}.setBeneficial()); // 0xffe89b
 		
-		registerPotion(registry, "fireskin", new PotionMagicEffectParticles(false, 0,
-				new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/fireskin.png")){
-			@Override
-			public void spawnCustomParticle(World world, double x, double y, double z){
-				world.spawnParticle(EnumParticleTypes.FLAME, x, y, z, 0, 0, 0);
-			}
-
-			@Override
-			public void performEffect(EntityLivingBase entitylivingbase, int strength){
-				entitylivingbase.extinguish(); // Stops melee mobs that are on fire from setting the player on fire,
-				// without allowing the player to actually stand in fire or swim in lava without taking damage.
-			}
-		}.setBeneficial()); // 0xff2f02
+		registerPotion(registry, "fireskin", new PotionFireskin(false, 0xff2f02,
+				new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/fireskin.png")));
 		
 		registerPotion(registry, "ice_shroud", new PotionMagicEffectParticles(false, 0,
 				new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/ice_shroud.png")){