From 596decb191070a0ad7ce166e1713a58024e95554 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 29 Jun 2022 22:23:02 +0200 Subject: [PATCH] fixed fallout, mini nuke 16" shells --- .../java/com/hbm/config/FalloutConfigJSON.java | 9 +++++---- .../com/hbm/entity/effect/EntityFalloutRain.java | 6 +----- .../java/com/hbm/items/weapon/ItemAmmoArty.java | 3 ++- .../textures/blocks/mass_storage_side_desh.png | Bin 0 -> 319 bytes .../hbm/textures/blocks/mass_storage_top_desh.png | Bin 0 -> 311 bytes 5 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/blocks/mass_storage_side_desh.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/mass_storage_top_desh.png diff --git a/src/main/java/com/hbm/config/FalloutConfigJSON.java b/src/main/java/com/hbm/config/FalloutConfigJSON.java index 2287a3b9d..ea22bb2d8 100644 --- a/src/main/java/com/hbm/config/FalloutConfigJSON.java +++ b/src/main/java/com/hbm/config/FalloutConfigJSON.java @@ -32,8 +32,9 @@ public class FalloutConfigJSON { File config = new File(folder.getAbsolutePath() + File.separatorChar + "hbmFallout.json"); + initDefault(); + if(!config.exists()) { - initDefault(); writeDefault(config); } } @@ -149,7 +150,7 @@ public class FalloutConfigJSON { private Triplet[] secondaryBlocks = null; private double primaryChance = 1.0D; private double minDist = 0.0D; - private double maxDist = 1.0D; + private double maxDist = 100.0D; private boolean isSolid = false; @@ -172,7 +173,7 @@ public class FalloutConfigJSON { if(matchesOpaque && !b.isOpaqueCube()) return false; if(dist > maxDist || dist < minDist) return false; - if(primaryChance < 1F && rand.nextFloat() > primaryChance) { + if(primaryChance == 1D || rand.nextDouble() < primaryChance) { if(primaryBlocks == null) return false; @@ -201,7 +202,7 @@ public class FalloutConfigJSON { int r = rand.nextInt(weight); for(Triplet choice : blocks) { - r += choice.getZ(); + r -= choice.getZ(); if(r <= 0) { return new MetaBlock(choice.getX(), choice.getY()); diff --git a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java index 43e8e550f..3fb6146a7 100644 --- a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java +++ b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java @@ -4,14 +4,11 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.BombConfig; import com.hbm.config.FalloutConfigJSON; import com.hbm.config.FalloutConfigJSON.FalloutEntry; -import com.hbm.config.VersatileConfig; import com.hbm.saveddata.AuxSavedData; -import com.hbm.util.Tuple.Quintet; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; @@ -21,7 +18,6 @@ import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.common.util.ForgeDirection; import java.util.*; -import java.util.function.Consumer; public class EntityFalloutRain extends Entity { private boolean firstTick = true; // Of course Vanilla has it private in Entity... @@ -172,7 +168,7 @@ public class EntityFalloutRain extends Entity { } if(!eval && b.isNormalCube()) { - return; + depth++; } /*if (b == Blocks.leaves || b == Blocks.leaves2) { diff --git a/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java b/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java index 540301887..525f26f03 100644 --- a/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java +++ b/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java @@ -186,7 +186,8 @@ public class ItemAmmoArty extends Item { }; this.types[MINI_NUKE] = new ArtilleryShell("ammo_arty_mini_nuke") { @Override public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) { - ExplosionNukeSmall.explode(shell.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, ExplosionNukeSmall.medium); + Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize(); + ExplosionNukeSmall.explode(shell.worldObj, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, ExplosionNukeSmall.medium); shell.setDead(); } }; diff --git a/src/main/resources/assets/hbm/textures/blocks/mass_storage_side_desh.png b/src/main/resources/assets/hbm/textures/blocks/mass_storage_side_desh.png new file mode 100644 index 0000000000000000000000000000000000000000..989e0fd91d55094e8a326d438ba32d87f44d9dc4 GIT binary patch literal 319 zcmV-F0l@x=P)6o)^gC|FQ3!4h$U9HA2i^;!QB82ua$y_)A~+QgB&`L*3Nu@It(4dL7C!m9TSlu}+3Kvh*i8qXj}5^uU| zW>jCV?F33G;yAYULKKnv?p*}#TJQ*lz(o#Cms0k>gOF(_fqMtNU*Ti<9xQB=WiU@u z^jVYVIRIIf0a*EHJhBZ!zwKo*Y0b?aun6`=VJ!+V1mJi&Ho26N-S^HL_5h@mYJ2YN R*cbo+002ovPDHLkV1h%S(cgR3MMqtynt{?&N4*tN4pQWti4#>Y)`NL-lSKyK^UBNlLLLwT+-1%l??Y$>^ zUT&W3_jYlaE$6SLJXk%qaxmjeA!BH7l!@+Ps;&XUW?fU&(Rx$b8=TEx6dg@m3 zhfiM?u`zHcuIZn-cJJ++y+44~Pf}qNyjdJR@0wLtFGq`jg3^@K%uoa4B~t?D-&%HX zkAI{0lw~W!{W>Zw%Eeut?0xkuX#-1In<3koo>i-C;yIRv)C)5@cxArbDEm_NLX^Lk zyb8y28`k~