From a5bc0cd4dcd78916a4dff064980902eb08c32033 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 30 Nov 2022 20:47:38 +0100 Subject: [PATCH] minor tweaks --- .../java/com/hbm/items/armor/ItemModDefuser.java | 3 ++- .../java/com/hbm/items/armor/ItemModSensor.java | 8 ++++---- .../java/com/hbm/world/feature/OreLayer3D.java | 16 ++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/hbm/items/armor/ItemModDefuser.java b/src/main/java/com/hbm/items/armor/ItemModDefuser.java index 794aad169..48eb2afe9 100644 --- a/src/main/java/com/hbm/items/armor/ItemModDefuser.java +++ b/src/main/java/com/hbm/items/armor/ItemModDefuser.java @@ -44,8 +44,9 @@ public class ItemModDefuser extends ItemArmorMod { for(EntityCreeper creeper : creepers) { - if(creeper.getCreeperState() == 1 ) { + if(creeper.getCreeperState() == 1 || creeper.func_146078_ca()) { creeper.setCreeperState(-1); + creeper.getDataWatcher().updateObject(18, new Byte((byte) 0)); EntityAICreeperSwell toRem = null; for(Object o : creeper.tasks.taskEntries) { diff --git a/src/main/java/com/hbm/items/armor/ItemModSensor.java b/src/main/java/com/hbm/items/armor/ItemModSensor.java index cf1b147ba..cfdec7ff9 100644 --- a/src/main/java/com/hbm/items/armor/ItemModSensor.java +++ b/src/main/java/com/hbm/items/armor/ItemModSensor.java @@ -52,10 +52,10 @@ public class ItemModSensor extends ItemArmorMod { boolean poison = false; boolean explosive = false; - for(int i = -2; i <= 2; i++) { + for(int i = -3; i <= 3; i++) { for(int j = -1; j <= 1; j++) { - for(int k = -2; k <= 2; k++) { - Block b = entity.worldObj.getBlock(x + i * 3, y + j * 3, z + k * 3); + for(int k = -3; k <= 3; k++) { + Block b = entity.worldObj.getBlock(x + i * 2, y + j * 2, z + k * 2); if(b == ModBlocks.gas_asbestos || b == ModBlocks.gas_coal || b == ModBlocks.gas_radon || b == ModBlocks.gas_monoxide || b == ModBlocks.gas_radon_dense || b == ModBlocks.chlorine_gas) { poison = true; } @@ -69,7 +69,7 @@ public class ItemModSensor extends ItemArmorMod { if(explosive) { entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.follyAquired", 0.5F, 1.0F); } else if(poison) { - entity.worldObj.playSoundAtEntity(entity, "hbm:item.techBoop", 0.5F, 1.5F); + entity.worldObj.playSoundAtEntity(entity, "hbm:item.techBoop", 2F, 1.5F); } } } diff --git a/src/main/java/com/hbm/world/feature/OreLayer3D.java b/src/main/java/com/hbm/world/feature/OreLayer3D.java index 718b859b6..8279a0158 100644 --- a/src/main/java/com/hbm/world/feature/OreLayer3D.java +++ b/src/main/java/com/hbm/world/feature/OreLayer3D.java @@ -39,22 +39,22 @@ public class OreLayer3D { int cX = event.chunkX; int cZ = event.chunkZ; - - double scale = 0.01D; - int threshold = 5; + + double scaleH = 0.02D; + double scaleV = 0.2D; for(int x = cX + 8; x < cX + 24; x++) { for(int z = cZ + 8; z < cZ + 24; z++) { - double nY = this.noiseY.func_151601_a(x, z); + double nY = this.noiseY.func_151601_a(x * scaleH, z * scaleH); - if(nY > 3) { + if(nY > 4) { for(int y = 64; y > 5; y--) { - double nX = this.noiseY.func_151601_a(y, z); - double nZ = this.noiseY.func_151601_a(x, y); + double nX = this.noiseX.func_151601_a(y * scaleV, z * scaleH); + double nZ = this.noiseZ.func_151601_a(x * scaleH, y * scaleV); - if(nX > 3 && nZ > 3) { + if(nX > 4 && nZ > 4) { Block target = world.getBlock(x, y, z); if(target.isNormalCube() && target.getMaterial() == Material.rock) {