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

Fixed stopping the meteor flying sound without ever initializing it. Fixed meteors destroying bedrock. Added a hardness limit to which blocks that can be replaced.

Browse Source
This commit is contained in:
DangerousMilk 2025-10-22 21:19:22 +02:00
parent 193f011619
commit c8a0b7f89a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/hbm/entity/projectile/EntityMeteor.java
View File

@ -50,22 +50,23 @@ public class EntityMeteor extends Entity {
return foundBlocks; return foundBlocks;
} }
public boolean damageOrDestroyBlock(World world, int blockX, int blockY, int blockZ) public void damageOrDestroyBlock(World world, int blockX, int blockY, int blockZ)
{ {
if(safe) return true; if(safe) return;
// Get current block info // Get current block info
Block block = world.getBlock(blockX, blockY, blockZ); Block block = world.getBlock(blockX, blockY, blockZ);
if (block == null) return false; if (block == null) return;
float hardness = block.getBlockHardness(world, blockX, blockY, blockZ); float hardness = block.getBlockHardness(world, blockX, blockY, blockZ);
// Check if the block is weak and can be destroyed // Check if the block is weak and can be destroyed
if (block == Blocks.leaves || block == Blocks.log || hardness <= 0.3F) { if (block == Blocks.leaves || block == Blocks.log || (hardness >= 0 && hardness <= 0.3F)) {
// Destroy the block // Destroy the block
world.setBlockToAir(blockX, blockY, blockZ); world.setBlockToAir(blockX, blockY, blockZ);
} }
else { else {
// Found solid block // Found solid block
if(hardness < 0 || hardness > 5F) return;
if(rand.nextInt(6) == 1){ if(rand.nextInt(6) == 1){
// Turn blocks into damaged variants // Turn blocks into damaged variants
if(block == Blocks.dirt) { if(block == Blocks.dirt) {
@ -86,11 +87,7 @@ public class EntityMeteor extends Entity {
world.setBlock(blockX, blockY, blockZ, ModBlocks.waste_earth); world.setBlock(blockX, blockY, blockZ, ModBlocks.waste_earth);
} }
} }
return true;
} }
return false;
} }
public void clearMeteorPath(World world, int x, int y, int z) { public void clearMeteorPath(World world, int x, int y, int z) {
@ -133,15 +130,13 @@ public class EntityMeteor extends Entity {
} }
// Bury the meteor into the ground // Bury the meteor into the ground
int spawnPosX = (int) (Math.round(this.posX - 0.5D) + (safe ? 0 : (this.motionZ * 5))); int spawnPosX = (int) (Math.round(this.posX - 0.5D) + (safe ? 0 : (this.motionZ * 4)));
int spawnPosY = (int) Math.round(this.posY - (safe ? 0 : 4)); int spawnPosY = (int) Math.round(this.posY - (safe ? 0 : 4));
int spawnPosZ = (int) (Math.round(this.posZ - 0.5D) + (safe ? 0 : (this.motionZ * 5))); int spawnPosZ = (int) (Math.round(this.posZ - 0.5D) + (safe ? 0 : (this.motionZ * 4)));
(new Meteorite()).generate(worldObj, rand, spawnPosX, spawnPosY, spawnPosZ, safe, true, true); (new Meteorite()).generate(worldObj, rand, spawnPosX, spawnPosY, spawnPosZ, safe, true, true);
clearMeteorPath(worldObj, spawnPosX, spawnPosY, spawnPosZ); clearMeteorPath(worldObj, spawnPosX, spawnPosY, spawnPosZ);
// Sound
if(this.audioFly != null) this.audioFly.stopSound();
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:entity.oldExplosion", 10000.0F, 0.5F + this.rand.nextFloat() * 0.1F); this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:entity.oldExplosion", 10000.0F, 0.5F + this.rand.nextFloat() * 0.1F);
this.setDead(); this.setDead();
@ -150,6 +145,10 @@ public class EntityMeteor extends Entity {
// Sound // Sound
if(worldObj.isRemote){ if(worldObj.isRemote){
if(this.isDead) {
if(this.audioFly != null) this.audioFly.stopSound();
}
if(this.audioFly.isPlaying()) { if(this.audioFly.isPlaying()) {
// Update sound // Update sound
this.audioFly.keepAlive(); this.audioFly.keepAlive();