From 9943a73f2a9a24a746a42875b3aed6a5cf2ec7c5 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 26 Mar 2025 16:53:07 +0100 Subject: [PATCH] groundbreaking changes --- changelog | 7 ++++++- src/main/java/com/hbm/blocks/bomb/BlockTaint.java | 3 ++- .../com/hbm/items/weapon/sedna/factory/XFactory10ga.java | 2 +- .../com/hbm/items/weapon/sedna/factory/XFactory50.java | 2 +- .../com/hbm/items/weapon/sedna/factory/XFactory762mm.java | 2 +- .../com/hbm/items/weapon/sedna/mods/WeaponModManager.java | 3 +-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changelog b/changelog index 299a12998..7cde1fc3f 100644 --- a/changelog +++ b/changelog @@ -2,4 +2,9 @@ * .75 bolts now work as advertised * Updated lead pipe texture * Removed recipes from a few ancient melee weapons, as well as the creative tab listing -* Removed flat magnets \ No newline at end of file +* Removed flat magnets +* Taint should now also affect non-solid blocks that are full cubes +* Reduced the AoE size of 7.62mm, .50 BMG and 10 gauge explosive projectiles + +## Fixed +* Fixed taint destroying bedrock \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java index 079058a64..c82d2526d 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java @@ -19,6 +19,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -46,7 +47,7 @@ public class BlockTaint extends Block implements ITooltipProvider { if(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue; if(rand.nextFloat() > 0.25F) continue; Block b = world.getBlock(x + i, y + j, z + k); - if(!b.isNormalCube() || b.isAir(world, x + i, y + j, z + k)) continue; + if(!b.renderAsNormalBlock() || b.isAir(world, x + i, y + j, z + k) || b == Blocks.bedrock) continue; int targetMeta = meta + 1; boolean hasAir = false; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java index e875b7800..c452655d3 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java @@ -35,7 +35,7 @@ public class XFactory10ga { public static BiConsumer LAMBDA_TINY_EXPLODE = (bullet, mop) -> { if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; - Lego.tinyExplode(bullet, mop, 2F); bullet.setDead(); + Lego.tinyExplode(bullet, mop, 1.5F); bullet.setDead(); }; public static void init() { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java index 1dded0aab..e67396128 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java @@ -36,7 +36,7 @@ public class XFactory50 { public static BiConsumer LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> { if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; - Lego.tinyExplode(bullet, mop, 3.5F); bullet.setDead(); + Lego.tinyExplode(bullet, mop, 2F); bullet.setDead(); }; public static void init() { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java index eb7b7b79e..b87fba86d 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java @@ -43,7 +43,7 @@ public class XFactory762mm { public static BiConsumer LAMBDA_TINY_EXPLODE = (bullet, mop) -> { if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; - Lego.tinyExplode(bullet, mop, 2F); bullet.setDead(); + Lego.tinyExplode(bullet, mop, 1.5F); bullet.setDead(); }; public static void init() { diff --git a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModManager.java b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModManager.java index 359936bd2..f586acccc 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModManager.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModManager.java @@ -71,8 +71,7 @@ public class WeaponModManager { Item[] steelGuns = new Item[] { ModItems.gun_light_revolver, ModItems.gun_light_revolver_atlas, - ModItems.gun_henry, - ModItems.gun_henry_lincoln, + ModItems.gun_henry, ModItems.gun_henry_lincoln, ModItems.gun_greasegun, ModItems.gun_maresleg, ModItems.gun_maresleg_akimbo, ModItems.gun_flaregun };