xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

groundbreaking changes

Browse Source
This commit is contained in:
Boblet 2025-03-26 16:53:07 +01:00
parent 473bdd67c4
commit 9943a73f2a
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changelog
View File

@ -2,4 +2,9 @@
* .75 bolts now work as advertised * .75 bolts now work as advertised
* Updated lead pipe texture * Updated lead pipe texture
* Removed recipes from a few ancient melee weapons, as well as the creative tab listing * Removed recipes from a few ancient melee weapons, as well as the creative tab listing
* Removed flat magnets * 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

3
src/main/java/com/hbm/blocks/bomb/BlockTaint.java
View File

@ -19,6 +19,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityFallingBlock;
import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect; 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(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue;
if(rand.nextFloat() > 0.25F) continue; if(rand.nextFloat() > 0.25F) continue;
Block b = world.getBlock(x + i, y + j, z + k); 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; int targetMeta = meta + 1;
boolean hasAir = false; boolean hasAir = false;
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java
View File

@ -35,7 +35,7 @@ public class XFactory10ga {
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_TINY_EXPLODE = (bullet, mop) -> { public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_TINY_EXPLODE = (bullet, mop) -> {
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; 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() { public static void init() {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java
View File

@ -36,7 +36,7 @@ public class XFactory50 {
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> { public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> {
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; 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() { public static void init() {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java
View File

@ -43,7 +43,7 @@ public class XFactory762mm {
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_TINY_EXPLODE = (bullet, mop) -> { public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_TINY_EXPLODE = (bullet, mop) -> {
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; 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() { public static void init() {

3
src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModManager.java
View File

@ -71,8 +71,7 @@ public class WeaponModManager {
Item[] steelGuns = new Item[] { Item[] steelGuns = new Item[] {
ModItems.gun_light_revolver, ModItems.gun_light_revolver_atlas, ModItems.gun_light_revolver, ModItems.gun_light_revolver_atlas,
ModItems.gun_henry, ModItems.gun_henry, ModItems.gun_henry_lincoln,
ModItems.gun_henry_lincoln,
ModItems.gun_greasegun, ModItems.gun_greasegun,
ModItems.gun_maresleg, ModItems.gun_maresleg_akimbo, ModItems.gun_maresleg, ModItems.gun_maresleg_akimbo,
ModItems.gun_flaregun }; ModItems.gun_flaregun };