Merge pull request #2031 from Lazzzycatwastaken/AAAAAAAAAAAAAAA

im mining my naval

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -265,6 +265,7 @@ public class ModBlocks {
 	public static Block deco_tungsten;
 	public static Block deco_aluminium;
 	public static Block deco_steel;
+	public static Block deco_rusty_steel;
 	public static Block deco_lead;
 	public static Block deco_beryllium;
 	public static Block deco_asbestos;
@@ -557,6 +558,7 @@ public class ModBlocks {
 	public static Block mine_he;
 	public static Block mine_shrap;
 	public static Block mine_fat;
+	public static Block mine_naval;
 
 	public static Block crate;
 	public static Block crate_weapon;
@@ -1455,6 +1457,7 @@ public class ModBlocks {
 		deco_tungsten = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_tungsten").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_tungsten");
 		deco_aluminium = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_aluminium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_aluminium");
 		deco_steel = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_steel").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel");
+		deco_rusty_steel = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_rusty_steel").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_rusty_steel");
 		deco_lead = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_lead").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_lead");
 		deco_beryllium = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_beryllium");
 		deco_asbestos = new BlockOutgas(Material.cloth, true, 5, true).noFortune().setBlockName("deco_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_asbestos");
@@ -1745,6 +1748,7 @@ public class ModBlocks {
 		mine_he = new Landmine(Material.iron, 2D, 5D).setBlockName("mine_he").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_he");
 		mine_shrap = new Landmine(Material.iron, 1.5D, 1D).setBlockName("mine_shrap").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_shrap");
 		mine_fat = new Landmine(Material.iron, 2.5D, 1D).setBlockName("mine_fat").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_fat");
+		mine_naval = new Landmine(Material.iron, 2.5D, 1D).setBlockName("mine_naval").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_naval");
 		dynamite = new BlockDynamite().setBlockName("dynamite").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":dynamite");
 		tnt = new BlockTNT().setBlockName("tnt_ntm").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":tnt");
 		semtex = new BlockSemtex().setBlockName("semtex").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":semtex");
@@ -2603,6 +2607,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(deco_tungsten, deco_tungsten.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_aluminium, deco_aluminium.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_steel, deco_steel.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_rusty_steel, deco_rusty_steel.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_lead, deco_lead.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_beryllium, deco_beryllium.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_asbestos, deco_asbestos.getUnlocalizedName());
@@ -2898,6 +2903,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(mine_shrap, mine_shrap.getUnlocalizedName());
 		GameRegistry.registerBlock(mine_he, mine_he.getUnlocalizedName());
 		GameRegistry.registerBlock(mine_fat, mine_fat.getUnlocalizedName());
+		GameRegistry.registerBlock(mine_naval, mine_naval.getUnlocalizedName());
 
 		//Block Bombs
 		GameRegistry.registerBlock(flame_war, flame_war.getUnlocalizedName());

src/main/java/com/hbm/blocks/bomb/Landmine.java

@@ -26,6 +26,7 @@ import net.minecraft.block.BlockFence;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -67,8 +68,7 @@ public class Landmine extends BlockContainer implements IBomb {
 		if(this == ModBlocks.mine_ap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
 		if(this == ModBlocks.mine_he) this.setBlockBounds(4 * f, 0.0F, 4 * f, 12 * f, 2 * f, 12 * f);
 		if(this == ModBlocks.mine_shrap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
-		if(this == ModBlocks.mine_fat) this.setBlockBounds(5 * f, 0.0F, 4 * f, 11 * f, 6 * f, 12 * f);
-	}
+		if(this == ModBlocks.mine_fat) this.setBlockBounds(5 * f, 0.0F, 4 * f, 11 * f, 6 * f, 12 * f);}
 
 	@Override
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
@@ -133,6 +133,18 @@ public class Landmine extends BlockContainer implements IBomb {
 		return false;
 	}
 
+	public boolean isWaterAbove(World world, int x, int y, int z) {
+		for(int xo = -1; xo <= 1; xo++) {
+			for(int zo = -1; zo <= 1; zo++) {
+				Block blockAbove = world.getBlock(x + xo, y + 1, z + zo);
+				if(blockAbove == Blocks.water || blockAbove == Blocks.flowing_water) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public BombReturnCode explode(World world, int x, int y, int z) {
 
@@ -165,6 +177,23 @@ public class Landmine extends BlockContainer implements IBomb {
 
 				ExplosionLarge.spawnShrapnelShower(world, x + 0.5, y + 0.5, z + 0.5, 0, 1D, 0, 45, 0.2D);
 				ExplosionLarge.spawnShrapnels(world, x + 0.5, y + 0.5, z + 0.5, 5);
+			} else if(this == ModBlocks.mine_naval) {
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 5, y + 5, z + 5, 25F);
+				vnt.setBlockAllocator(new BlockAllocatorStandard(64));
+				vnt.setBlockProcessor(new BlockProcessorStandard());
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, ServerConfig.MINE_NAVAL_DAMAGE.get()).setupPiercing(5F, 0.2F));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectWeapon(10, 1F, 0.5F));
+				vnt.explode();
+
+				ExplosionLarge.spawnParticlesRadial(world, x + 0.5, y + 2, z + 0.5, 30);
+				ExplosionLarge.spawnRubble(world,x + 0.5, y + 0.5, z + 0.5, 5 );
+
+				// Only spawn water effects if there's water above the mine
+				if (isWaterAbove(world, x, y, z)) {
+					ExplosionLarge.spawnFoam(world, x + 0.5, y + 0.5, z + 0.5, 60);
+				}
+
 			} else if(this == ModBlocks.mine_fat) {
 
 				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 10);
@@ -180,6 +209,7 @@ public class Landmine extends BlockContainer implements IBomb {
 				data.setBoolean("balefire", MainRegistry.polaroidID == 11 || world.rand.nextInt(100) == 0);
 				PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, x + 0.5, y + 0.5, z + 0.5), new TargetPoint(world.provider.dimensionId, x + 0.5, y + 0.5, z + 0.5, 250));
 
+				world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:weapon.mukeExplosion", 25.0F, 0.9F); // this has to be the single worst solution ever
 			}
 		}
 

src/main/java/com/hbm/config/ServerConfig.java

@@ -15,6 +15,7 @@ public class ServerConfig extends RunningConfig {
 	public static ConfigWrapper<Float> MINE_HE_DAMAGE =					new ConfigWrapper(35F);
 	public static ConfigWrapper<Float> MINE_SHRAP_DAMAGE =				new ConfigWrapper(7.5F);
 	public static ConfigWrapper<Float> MINE_NUKE_DAMAGE =				new ConfigWrapper(100F);
+	public static ConfigWrapper<Float> MINE_NAVAL_DAMAGE =					new ConfigWrapper(60F);
 	public static ConfigWrapper<Boolean> TAINT_TRAILS =					new ConfigWrapper(false);
 
 	private static void initDefaults() {
@@ -23,6 +24,7 @@ public class ServerConfig extends RunningConfig {
 		configMap.put("MINE_HE_DAMAGE", MINE_HE_DAMAGE);
 		configMap.put("MINE_SHRAP_DAMAGE", MINE_SHRAP_DAMAGE);
 		configMap.put("MINE_NUKE_DAMAGE", MINE_NUKE_DAMAGE);
+		configMap.put("MINE_NAVAL_DAMAGE", MINE_NAVAL_DAMAGE);
 		configMap.put("TAINT_TRAILS", TAINT_TRAILS);
 	}
 

src/main/java/com/hbm/explosion/ExplosionLarge.java

@@ -40,6 +40,15 @@ public class ExplosionLarge {
 		PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z),  new TargetPoint(world.provider.dimensionId, x, y, z, 250));
 	}
 
+	public static void spawnFoam(World world, double x, double y, double z, int count) {
+
+		NBTTagCompound data = new NBTTagCompound();
+		data.setString("type", "smoke");
+		data.setString("mode", "foamSplash");
+		data.setInteger("count", count);
+		PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z),  new TargetPoint(world.provider.dimensionId, x, y, z, 250));
+	}
+
 	public static void spawnShock(World world, double x, double y, double z, int count, double strength) {
 
 		NBTTagCompound data = new NBTTagCompound();

src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java

@@ -153,6 +153,7 @@ public class AssemblerRecipes extends SerializableRecipe {
 		makeRecipe(new ComparableStack(ModBlocks.watz_element, 3), new AStack[] {new OreDictStack(STEEL.plateCast(), 2), new OreDictStack(ZR.ingot(), 2), new OreDictStack(BIGMT.ingot(), 2), new OreDictStack(ANY_HARDPLASTIC.ingot(), 4)},200);
 		makeRecipe(new ComparableStack(ModBlocks.watz_cooler, 3), new AStack[] {new OreDictStack(STEEL.plateCast(), 2), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 2), }, 200);
 		makeRecipe(new ComparableStack(ModBlocks.watz_end, 3), new AStack[] {new OreDictStack(ANY_RESISTANTALLOY.plateWelded()), new OreDictStack(B.ingot(), 3), new OreDictStack(STEEL.plateWelded(), 2), }, 100);
+		makeRecipe(new ComparableStack(ModBlocks.mine_naval, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED), new ComparableStack(ModBlocks.block_semtex, 5)},300);
 		makeRecipe(new ComparableStack(ModBlocks.nuke_gadget, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.fins_flat, 2), new ComparableStack(ModItems.pedestal_steel, 1), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.CONTROLLER), new OreDictStack("dyeGray", 8), },300);
 		makeRecipe(new ComparableStack(ModBlocks.nuke_boy, 1), new AStack[] {new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.fins_small_steel, 1), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.CONTROLLER), new OreDictStack("dyeBlue", 4), },300);
 		makeRecipe(new ComparableStack(ModBlocks.nuke_man, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.fins_big_steel, 1), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.CONTROLLER), new OreDictStack("dyeYellow", 6), },300);

src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java

@@ -390,6 +390,10 @@ public class ChemplantRecipes extends SerializableRecipe {
 						new ItemStack(ModItems.niter, 3))
 				.outputFluids(new FluidStack(Fluids.SALIENT, 250)));
 
+		recipes.add(new ChemRecipe(104, "RUSTY_DECO_STEEL", 100)
+			.inputItems(new ComparableStack(ModBlocks.deco_steel, 8))
+			.inputFluids(new FluidStack(Fluids.WATER, 1000))
+			.outputItems(new ItemStack(ModBlocks.deco_rusty_steel, 8)));
 	}
 
 	public static void registerOtherOil() {

src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java

@@ -648,6 +648,7 @@ public class AnvilRecipes extends SerializableRecipe {
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_tungsten, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 1))}).setTier(1));
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_aluminium, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_aluminium, 1))}).setTier(1));
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_steel, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1))}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_rusty_steel, 8), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1))}).setTier(1));
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_lead, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_lead, 1))}).setTier(1));
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_beryllium, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 1))}).setTier(1));
 		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_asbestos, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_asbestos, 1))}).setTier(1));

src/main/java/com/hbm/main/ClientProxy.java

@@ -1055,8 +1055,31 @@ public class ClientProxy extends ServerProxy {
 					vec.rotateAroundY(360 / count);
 				}
 			}
+
+			if("foamSplash".equals(mode)) {
+
+				double strength = data.getDouble("range");
+
+				Vec3 vec = Vec3.createVectorHelper(strength, 0, 0);
+
+				for(int i = 0; i < count; i++) {
+
+					vec.rotateAroundY((float) Math.toRadians(rand.nextFloat() * 360F));
+
+					ParticleFoam fx = new ParticleFoam(man, world, x + vec.xCoord, y, z + vec.zCoord);
+					fx.maxAge = 50;
+					fx.motionY = 0;
+					fx.motionX = 0;
+					fx.motionZ = 0;
+					Minecraft.getMinecraft().effectRenderer.addEffect(fx);
+
+					vec.rotateAroundY(360 / count);
+				}
+			}
 		}
 
+
+
 		if("exhaust".equals(type)) {
 
 			String mode = data.getString("mode");

src/main/java/com/hbm/main/ResourceManager.java

@@ -61,6 +61,8 @@ public class ResourceManager {
 	public static final IModelCustom mine_ap = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/ap_mine.obj")).asVBO();
 	public static final IModelCustom mine_marelet = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/marelet.obj")).asVBO();
 	public static final IModelCustom mine_fat = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/mine_fat.obj"));
+	public static final IModelCustom mine_naval = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/NMine.obj"));
+
 
 	//Oil Pumps
 	public static final IModelCustom derrick = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/derrick.obj")).asVBO();
@@ -447,6 +449,7 @@ public class ResourceManager {
 	public static final ResourceLocation mine_marelet_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/mine_marelet.png");
 	public static final ResourceLocation mine_shrap_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/mine_shrapnel.png");
 	public static final ResourceLocation mine_fat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_fat.png");
+	public static final ResourceLocation mine_naval_tex = new ResourceLocation(RefStrings.MODID, "textures/models/NMine.png");
 
 	//Heaters
 	public static final ResourceLocation heater_firebox_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/firebox.png");

src/main/java/com/hbm/particle/ParticleFoam.java

@@ -0,0 +1,189 @@
+package com.hbm.particle;
+
+import com.hbm.main.ModEventHandlerClient;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.world.World;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+@SideOnly(Side.CLIENT)
+public class ParticleFoam extends EntityFX {
+
+	private int age;
+	public int maxAge;
+	private float baseScale = 1.0F;
+	private float maxScale = 1.5F;
+
+	// Parameters for the trail effect
+	private List<TrailPoint> trail = new ArrayList<TrailPoint>();
+	private int trailLength = 15;
+	private float initialVelocity;
+	private float buoyancy = 0.05F;
+	private float jitter = 0.15F;
+	private float drag = 0.96F;
+	private int explosionPhase; // 0=burst up, 1=peak, 2=settle
+
+	private static class TrailPoint {
+		double x, y, z;
+		float alpha;
+
+		public TrailPoint(double x, double y, double z, float alpha) {
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.alpha = alpha;
+		}
+	}
+
+	public ParticleFoam(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) {
+		super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_);
+		particleIcon = ModEventHandlerClient.particleBase;
+
+		maxAge = 60 + rand.nextInt(60);
+		particleGravity = 0.005F + rand.nextFloat() * 0.015F;
+
+		initialVelocity = 2.0F + rand.nextFloat() * 3.0F;
+		motionY = initialVelocity;
+
+		double angle = rand.nextDouble() * Math.PI * 2;
+		double strength = rand.nextDouble() * 0.5;
+		motionX = Math.cos(angle) * strength;
+		motionZ = Math.sin(angle) * strength;
+
+		explosionPhase = 0; // Start in burst phase
+
+		particleScale = 0.3F + rand.nextFloat() * 0.7F;
+	}
+
+	public void setBaseScale(float f) { this.baseScale = f; }
+	public void setMaxScale(float f) { this.maxScale = f; }
+	public void setTrailLength(int length) { this.trailLength = length; }
+	public void setBuoyancy(float buoyancy) { this.buoyancy = buoyancy; }
+
+	public void onUpdate() {
+		this.prevPosX = this.posX;
+		this.prevPosY = this.posY;
+		this.prevPosZ = this.posZ;
+
+		trail.add(0, new TrailPoint(posX, posY, posZ, particleAlpha));
+
+		while (trail.size() > trailLength) {
+			trail.remove(trail.size() - 1);
+		}
+
+		// Update age and phase
+		++this.age;
+
+		if (this.age == this.maxAge) {
+			this.setDead();
+		}
+
+		float phaseRatio = (float) age / (float) maxAge;
+		if (phaseRatio < 0.3F) {
+			explosionPhase = 0;
+
+			if (phaseRatio < 0.15F) {
+				motionY += buoyancy * 6.0F;
+			} else {
+				motionY += buoyancy * (1.0F - (phaseRatio / 0.3F)) * 2.0F;
+			}
+
+			particleScale = baseScale + (maxScale - baseScale) * (phaseRatio / 0.3F);
+		} else if (phaseRatio < 0.6F) {
+			explosionPhase = 1;
+			motionY *= 0.98F;
+
+			particleScale = maxScale;
+		} else {
+			explosionPhase = 2;
+			motionY -= particleGravity;
+
+			particleScale = maxScale * (1.0F - ((phaseRatio - 0.6F) / 0.4F) * 0.7F);
+		}
+
+		particleAlpha = 0.8F * (1.0F - phaseRatio * phaseRatio);
+
+		motionX += (rand.nextFloat() - 0.5F) * jitter;
+		motionZ += (rand.nextFloat() - 0.5F) * jitter;
+
+		// drag like ninja drags the low taper fade
+		motionX *= drag;
+		motionY *= drag;
+		motionZ *= drag;
+
+		this.moveEntity(this.motionX, motionY, this.motionZ);
+
+		// Kill particle if it hits ground
+		if (this.onGround || this.isInWeb) {
+			this.setDead();
+		}
+	}
+
+	public int getFXLayer() {
+		return 1;
+	}
+
+	// ty kercig cuz id kms lol
+
+	public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) {
+		renderFoamBubbles(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_,
+			posX, posY, posZ, particleScale, particleAlpha);
+
+		for (int i = 1; i < trail.size(); i++) {
+			TrailPoint point = trail.get(i);
+			float trailScale = particleScale * (1.0F - (float)i / trailLength);
+			float trailAlpha = particleAlpha * (1.0F - (float)i / trailLength) * 0.7F;
+
+			renderFoamBubbles(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_,
+				point.x, point.y, point.z, trailScale, trailAlpha);
+		}
+	}
+
+	private void renderFoamBubbles(Tessellator tessellator, float p_70539_2_, float p_70539_3_, float p_70539_4_,
+								   float p_70539_5_, float p_70539_6_, float p_70539_7_, double x, double y, double z, float scale, float alpha) {
+
+		Random urandom = new Random(this.getEntityId() + (long)(x * 100) + (long)(y * 10) + (long)z);
+
+		int bubbleCount = explosionPhase == 0 ? 8 : (explosionPhase == 1 ? 6 : 4);
+
+		for (int i = 0; i < bubbleCount; i++) {
+			float whiteness = 0.9F + urandom.nextFloat() * 0.1F;
+			tessellator.setColorRGBA_F(whiteness, whiteness, whiteness, alpha);
+			tessellator.setNormal(0.0F, 1.0F, 0.0F);
+
+			float bubbleScale = scale * (urandom.nextFloat() * 0.5F + 0.75F);
+			float offset = explosionPhase == 0 ? 0.4F : (explosionPhase == 1 ? 0.6F : 0.9F);
+
+			float pX = (float) ((x - interpPosX) + (urandom.nextGaussian()) * offset);
+			float pY = (float) ((y - interpPosY) + (urandom.nextGaussian()) * offset * 0.7F);
+			float pZ = (float) ((z - interpPosZ) + (urandom.nextGaussian()) * offset);
+
+			tessellator.addVertexWithUV(
+				(double)(pX - p_70539_3_ * bubbleScale - p_70539_6_ * bubbleScale),
+				(double)(pY - p_70539_4_ * bubbleScale),
+				(double)(pZ - p_70539_5_ * bubbleScale - p_70539_7_ * bubbleScale),
+				particleIcon.getMaxU(), particleIcon.getMaxV());
+			tessellator.addVertexWithUV(
+				(double)(pX - p_70539_3_ * bubbleScale + p_70539_6_ * bubbleScale),
+				(double)(pY + p_70539_4_ * bubbleScale),
+				(double)(pZ - p_70539_5_ * bubbleScale + p_70539_7_ * bubbleScale),
+				particleIcon.getMaxU(), particleIcon.getMinV());
+			tessellator.addVertexWithUV(
+				(double)(pX + p_70539_3_ * bubbleScale + p_70539_6_ * bubbleScale),
+				(double)(pY + p_70539_4_ * bubbleScale),
+				(double)(pZ + p_70539_5_ * bubbleScale + p_70539_7_ * bubbleScale),
+				particleIcon.getMinU(), particleIcon.getMinV());
+			tessellator.addVertexWithUV(
+				(double)(pX + p_70539_3_ * bubbleScale - p_70539_6_ * bubbleScale),
+				(double)(pY - p_70539_4_ * bubbleScale),
+				(double)(pZ + p_70539_5_ * bubbleScale - p_70539_7_ * bubbleScale),
+				particleIcon.getMinU(), particleIcon.getMaxV());
+		}
+	}
+}

src/main/java/com/hbm/render/tileentity/RenderLandmine.java

@@ -54,6 +54,12 @@ public class RenderLandmine extends TileEntitySpecialRenderer {
 			bindTexture(ResourceManager.mine_fat_tex);
 			ResourceManager.mine_fat.renderAll();
 		}
+		if(block == ModBlocks.mine_naval) {
+			GL11.glScaled(1D, 1D, 1D);
+			GL11.glTranslated(0,0.5,0);
+			bindTexture(ResourceManager.mine_naval_tex);
+			ResourceManager.mine_naval.renderAll();
+		}
 
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glPopMatrix();

src/main/java/com/hbm/world/gen/NBTStructure.java

@@ -794,6 +794,7 @@ public class NBTStructure {
 
 	}
 
+
 	// Each jigsaw block in a structure will instance one of these
 	private static class JigsawConnection {
 

src/main/resources/assets/hbm/lang/en_US.lang

@@ -5337,6 +5337,7 @@ tile.deco_pipe_rim_green_rusted.name=Rusty Green Steel Pipe (Rimmed)
 tile.deco_pipe_rim_red.name=Red Steel Pipe (Rimmed)
 tile.deco_pipe_rim_marked.name=Gas Pipe (Rimmed)
 tile.deco_steel.name=Steel Deco Block
+tile.deco_rusty_steel.name=Rusty Steel Deco Block
 tile.deco_titanium.name=Titanium Deco Block
 tile.deco_toaster.name=Broken Toaster
 tile.deco_tungsten.name=Tungsten Deco Block
@@ -5739,6 +5740,7 @@ tile.meteor_polished.name=Polished Meteor Block
 tile.meteor_spawner.name=Cyber Crab Assembler
 tile.mine_ap.name=Anti-Personell Mine
 tile.mine_fat.name=Fat Mine
+tile.mine_naval.name=Naval Mine
 tile.mine_he.name=Anti-Tank Mine
 tile.mine_shrap.name=Shrapnel Mine
 tile.moon_turf.name=Moon Turf