From 29176d0e821ce82629a9aaba0490e9f4034df135 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 5 Apr 2023 16:44:14 +0200 Subject: [PATCH] some fixes, watz pellets --- .../java/com/hbm/blocks/bomb/Landmine.java | 14 +++++++----- .../com/hbm/items/machine/ItemWatzPellet.java | 4 ++-- .../java/com/hbm/world/feature/DeepLayer.java | 8 +++---- .../java/com/hbm/world/feature/OreCave.java | 9 +++----- .../java/com/hbm/world/feature/OreLayer.java | 9 +++----- .../com/hbm/world/feature/OreLayer3D.java | 9 +++----- .../com/hbm/world/feature/SchistStratum.java | 2 +- src/main/resources/assets/hbm/lang/de_DE.lang | 20 ++++++++++++++++++ src/main/resources/assets/hbm/lang/en_US.lang | 20 ++++++++++++++++++ .../hbm/textures/items/crystal_energy.png | Bin 341 -> 0 bytes .../hbm/textures/items/pellet_coolant.png | Bin 363 -> 0 bytes 11 files changed, 64 insertions(+), 31 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/crystal_energy.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellet_coolant.png diff --git a/src/main/java/com/hbm/blocks/bomb/Landmine.java b/src/main/java/com/hbm/blocks/bomb/Landmine.java index 6d43d6106..85ebdc82c 100644 --- a/src/main/java/com/hbm/blocks/bomb/Landmine.java +++ b/src/main/java/com/hbm/blocks/bomb/Landmine.java @@ -25,7 +25,6 @@ import net.minecraft.world.World; public class Landmine extends BlockContainer implements IBomb { public static boolean safeMode = false; - static Random rand = new Random();; public Landmine(Material p_i45386_1_) { super(p_i45386_1_); @@ -100,18 +99,23 @@ public class Landmine extends BlockContainer implements IBomb { } if(flag) { - this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - world.setBlockToAir(x, y, z); + + if(!safeMode) { + explode(world, x, y, z); + } else { + world.setBlockToAir(x, y, z); + } } } - public void breakBlock(World world, int x, int y, int z, Block block, int i) { + @Override + public void onBlockDestroyedByPlayer(World world, int x, int y, int z, int meta) { if(!safeMode) { explode(world, x, y, z); } - super.breakBlock(world, x, y, z, block, i); + super.onBlockDestroyedByPlayer(world, x, y, z, meta); } public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float fx, float fy, float fz) { diff --git a/src/main/java/com/hbm/items/machine/ItemWatzPellet.java b/src/main/java/com/hbm/items/machine/ItemWatzPellet.java index d56bfa6e9..9eb418a54 100644 --- a/src/main/java/com/hbm/items/machine/ItemWatzPellet.java +++ b/src/main/java/com/hbm/items/machine/ItemWatzPellet.java @@ -35,15 +35,15 @@ public class ItemWatzPellet extends ItemEnumMulti { public static enum EnumWatzType { - //TODO: durability SCHRABIDIUM( 0x32FFFF, 0x005C5C, 2_000, 10D, new FunctionLogarithmic(10), null, null), HES( 0x66DCD6, 0x023933, 1_500, 10D, null, null, null), LES( 0xABB4A8, 0x0C1105, 500, 10D, null, null, null), MES( 0xCBEADF, 0x28473C, 1_000, 10D, null, null, null), - NP( 0xA6B2A6, 0x030F03, 0, 10D, null, null, null), + HEN( 0xA6B2A6, 0x030F03, 0, 10D, null, null, null), MEU( 0xC1C7BD, 0x2B3227, 0, 10D, null, null, null), MEP( 0x9AA3A0, 0x111A17, 0, 10D, null, null, null), LEAD( 0xA6A6B2, 0x03030F, 0, 0, null, null, new FunctionSqrt(10)), //standard absorber, negative coefficient + BORON( 0xBDC8D2, 0x29343E, 0, 0, null, null, new FunctionLinear(10)), //improved absorber, linear DU( 0xC1C7BD, 0x2B3227, 0, 0, null, null, new FunctionQuadratic(1D, 1D).withDiv(100)); //absorber with positive coefficient public double yield = 1_000_000_000; diff --git a/src/main/java/com/hbm/world/feature/DeepLayer.java b/src/main/java/com/hbm/world/feature/DeepLayer.java index 5e50efd0d..b8f29cf41 100644 --- a/src/main/java/com/hbm/world/feature/DeepLayer.java +++ b/src/main/java/com/hbm/world/feature/DeepLayer.java @@ -19,15 +19,13 @@ public class DeepLayer { @SubscribeEvent public void onDecorate(DecorateBiomeEvent.Pre event) { + + World world = event.world; + if(world.provider == null || world.provider.dimensionId != 0) return; if(this.noise == null) { this.noise = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + 19), 4); } - - World world = event.world; - - if(world.provider.dimensionId != 0) - return; int cX = event.chunkX; int cZ = event.chunkZ; diff --git a/src/main/java/com/hbm/world/feature/OreCave.java b/src/main/java/com/hbm/world/feature/OreCave.java index 2be6aa77a..eed1cdfdc 100644 --- a/src/main/java/com/hbm/world/feature/OreCave.java +++ b/src/main/java/com/hbm/world/feature/OreCave.java @@ -73,17 +73,14 @@ public class OreCave { @SubscribeEvent public void onDecorate(DecorateBiomeEvent.Pre event) { - if(event.world.provider.dimensionId != this.dim) return; + World world = event.world; + + if(world.provider == null || world.provider.dimensionId != this.dim) return; if(this.noise == null) { this.noise = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + (ore.getID() * 31) + yLevel), 2); } - World world = event.world; - - if(world.provider.dimensionId != 0) - return; - int cX = event.chunkX; int cZ = event.chunkZ; diff --git a/src/main/java/com/hbm/world/feature/OreLayer.java b/src/main/java/com/hbm/world/feature/OreLayer.java index 85b051525..b0411b147 100644 --- a/src/main/java/com/hbm/world/feature/OreLayer.java +++ b/src/main/java/com/hbm/world/feature/OreLayer.java @@ -67,17 +67,14 @@ public class OreLayer { @SubscribeEvent public void onDecorate(DecorateBiomeEvent.Pre event) { - if(event.world.provider.dimensionId != this.dim) return; + World world = event.world; + + if(world.provider == null || world.provider.dimensionId != this.dim) return; if(this.noise == null) { this.noise = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + (ore.getID() * 31) + yLevel), 4); } - World world = event.world; - - if(world.provider.dimensionId != 0) - return; - int cX = event.chunkX; int cZ = event.chunkZ; diff --git a/src/main/java/com/hbm/world/feature/OreLayer3D.java b/src/main/java/com/hbm/world/feature/OreLayer3D.java index 6c7f97da2..67fecb388 100644 --- a/src/main/java/com/hbm/world/feature/OreLayer3D.java +++ b/src/main/java/com/hbm/world/feature/OreLayer3D.java @@ -33,17 +33,14 @@ public class OreLayer3D { @SubscribeEvent public void onDecorate(DecorateBiomeEvent.Pre event) { + + World world = event.world; - if(event.world.provider.dimensionId != this.dim) return; + if(world.provider == null || world.provider.dimensionId != this.dim) return; if(this.noiseX == null) this.noiseX = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + 101), 4); if(this.noiseY == null) this.noiseY = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + 102), 4); if(this.noiseZ == null) this.noiseZ = new NoiseGeneratorPerlin(new Random(event.world.getSeed() + 103), 4); - - World world = event.world; - - if(world.provider.dimensionId != 0) - return; int cX = event.chunkX; int cZ = event.chunkZ; diff --git a/src/main/java/com/hbm/world/feature/SchistStratum.java b/src/main/java/com/hbm/world/feature/SchistStratum.java index d0fd94bb4..f16f4b93a 100644 --- a/src/main/java/com/hbm/world/feature/SchistStratum.java +++ b/src/main/java/com/hbm/world/feature/SchistStratum.java @@ -24,7 +24,7 @@ public class SchistStratum { World world = event.world; - if(world.provider.dimensionId != 0) + if(world.provider == null || world.provider.dimensionId != 0) return; int cX = event.chunkX; diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index f49aec1bb..fb18572e7 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3226,6 +3226,26 @@ item.waste_u235.name=Erschöpfter Uran-235-Kernbrennstoff item.waste_u233.name=Erschöpfter Uran-233-Kernbrennstoff item.waste_uranium.name=Erschöpfter Urankernbrennstoff item.watch.name=Zerbrochene Taschenuhr +item.watz_pellet.boron=Bor-Absorberpellet +item.watz_pellet.du=Abgereichertes Uran-Absorberpellet +item.watz_pellet.hes=HES-Watzpellet +item.watz_pellet.lead=Blei-Absorberpellet +item.watz_pellet.les=LES-Watzpellet +item.watz_pellet.mes=MES-Watzpellet +item.watz_pellet.mep=MEP-Watzpellet +item.watz_pellet.meu=MEU-Watzpellet +item.watz_pellet.hen=HEN-Watzpellet +item.watz_pellet.schrabidium=Schrabidium-Watzpellet +item.watz_pellet_depleted.boron=Bor-Absorberpellet (Erschöpft) +item.watz_pellet_depleted.du=Abgereichertes Uran-Absorberpellet (Erschöpft) +item.watz_pellet_depleted.hes=HES-Watzpellet (Erschöpft) +item.watz_pellet_depleted.lead=Blei-Absorberpellet (Erschöpft) +item.watz_pellet_depleted.les=LES-Watzpellet (Erschöpft) +item.watz_pellet_depleted.mes=MES-Watzpellet (Erschöpft) +item.watz_pellet_depleted.mep=MEP-Watzpellet (Erschöpft) +item.watz_pellet_depleted.meu=MEU-Watzpellet (Erschöpft) +item.watz_pellet_depleted.hen=HEN-Watzpellet (Erschöpft) +item.watz_pellet_depleted.schrabidium=Schrabidium-Watzpellet (Erschöpft) item.weapon_bat.name=Richards Standard item.weapon_bat_nail.name=Das Klischee item.weapon_golf_club.name=Schläger des russischen Mafiosos diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index b0c7451dc..d163eeec3 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4018,6 +4018,26 @@ item.waste_uranium.name=Depleted Uranium Fuel item.waste_zfb_mox.name=Depleted ZFB MOX Fuel item.watch.name=Broken Pocket Watch item.watch.desc=A small blue pocket watch.$It's glass has a few cracks in it,$and some shards are missing.$It stopped ticking at 2:34. +item.watz_pellet.boron=Boron Absorber Pellet +item.watz_pellet.du=Depleted Uranium Absorber Pellet +item.watz_pellet.hes=HES Watz Pellet +item.watz_pellet.lead=Lead Absorber Pellet +item.watz_pellet.les=LES Watz Pellet +item.watz_pellet.mes=MES Watz Pellet +item.watz_pellet.mep=MEP Watz Pellet +item.watz_pellet.meu=MEU Watz Pellet +item.watz_pellet.hen=HEN Watz Pellet +item.watz_pellet.schrabidium=Schrabidium Watz Pellet +item.watz_pellet_depleted.boron=Boron Absorber Pellet (Depleted) +item.watz_pellet_depleted.du=Depleted Uranium Absorber Pellet (Depleted) +item.watz_pellet_depleted.hes=HES Watz Pellet (Depleted) +item.watz_pellet_depleted.lead=Lead Absorber Pellet (Depleted) +item.watz_pellet_depleted.les=LES Watz Pellet (Depleted) +item.watz_pellet_depleted.mes=MES Watz Pellet (Depleted) +item.watz_pellet_depleted.mep=MEP Watz Pellet (Depleted) +item.watz_pellet_depleted.meu=MEU Watz Pellet (Depleted) +item.watz_pellet_depleted.hen=HEN Watz Pellet (Depleted) +item.watz_pellet_depleted.schrabidium=Schrabidium Watz Pellet (Depleted) item.weapon_bat.name=Richard's Default item.weapon_bat_nail.name=The Cliché item.weapon_golf_club.name=Russian Mobster's Club diff --git a/src/main/resources/assets/hbm/textures/items/crystal_energy.png b/src/main/resources/assets/hbm/textures/items/crystal_energy.png deleted file mode 100644 index f4d48089a41b0ef4800ad319aa204b19e3be28df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP)#1pg<-N&>gHiJ&T4g^fWYtM(7NFO4^}_Mo4F1 z9~K$9vim4{9}+Tsydx#xKam_LInYsl_RsM1z)m9)3fXDgNL!vzgybG^;ryz*+i65z z3vBSnYw5b#Y1|qpb=R(ni-Sk4^%Wa=UJF=VN5CIzj2$79u{yRfX!%?S05wJ!=Y)Xs zJTEe*d&EVC!JcgJueNXRTm1SIRmK=mD+EUhjB`5zu{kdQu(zUAPH z5IsH7)6*l|=n-y`OZ*r~uMlWkkUKCh$nzpTHH>rJ3WY%Aw~Lb30%MGjvF{@cdLa6` nYOp#c-+4d7*`xaHVf_i;Hq^T`X>ik700000NkvXXu0mjfPdkkK diff --git a/src/main/resources/assets/hbm/textures/items/pellet_coolant.png b/src/main/resources/assets/hbm/textures/items/pellet_coolant.png deleted file mode 100644 index 59c00dec46f499ce36ea9b6ceae1c6980ebf697f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmV-x0hIoUP)iXk$+IV-j zO?ZCl$-OKuaRpG5kx>`#6%X*ER0^wD20eW5JBrCpJ%Jyk2*zDxd5LAvL+n{n+!@TZ zCrBsL4N1fnVn0eHuZr*QZe$8AK~)@#yNEptoxvQhmqP%+y4Wc9H3I