diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 66c18898f..ff033692f 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1011,6 +1011,13 @@ item.bottle2_fritz.name=Fritz-Kola item.bottle2_korl_special.name=Das erste Korl item.bottle2_fritz_special.name=Die erste Fritz-Kola item.chocolate_milk.name=Schokomilch +item.cap_nuka.name=Nuka-Cola Kronkorken +item.cap_quantum.name=Nuka Cola Quantum Kronkorken +item.cap_korl.name=Korl Kronkorken +item.cap_fritz.name=Fritz-Kola Kronkorken +item.ring_pull.name=Dosenring + +item.bottle_opener.name=Hbms eigener selbstgebauter Flaschenöffner item.blades_aluminium.name=Aluminiumsägeblatt item.blades_gold.name=Goldenes Sägeblatt diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 4c565705d..90634edbc 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1011,6 +1011,13 @@ item.bottle2_fritz.name=Fritz Cola item.bottle2_korl_special.name=The First Korl item.bottle2_fritz_special.name=The First Fritz Cola item.chocolate_milk.name=Chocolate Milk +item.cap_nuka.name=Nuka Cola Bottle Cap +item.cap_quantum.name=Nuka Cola Quantum Bottle Cap +item.cap_korl.name=Korl Bottle Cap +item.cap_fritz.name=Fritz Cola Bottle Cap +item.ring_pull.name=Ring Pull + +item.bottle_opener.name=Hbm's Own Self-Made Bottle Opener item.blades_aluminium.name=Aluminium Shredder Blades item.blades_gold.name=Golden Shredder Blades diff --git a/assets/hbm/textures/ABC123.png b/assets/hbm/textures/ABC123.png index e2b5419cc..955c8821c 100644 Binary files a/assets/hbm/textures/ABC123.png and b/assets/hbm/textures/ABC123.png differ diff --git a/assets/hbm/textures/items/bottle_opener.png b/assets/hbm/textures/items/bottle_opener.png new file mode 100644 index 000000000..f30bfc3c4 Binary files /dev/null and b/assets/hbm/textures/items/bottle_opener.png differ diff --git a/assets/hbm/textures/items/bottle_quantum.png b/assets/hbm/textures/items/bottle_quantum.png index c86e8d855..37de09fcf 100644 Binary files a/assets/hbm/textures/items/bottle_quantum.png and b/assets/hbm/textures/items/bottle_quantum.png differ diff --git a/assets/hbm/textures/items/cap_fritz.png b/assets/hbm/textures/items/cap_fritz.png new file mode 100644 index 000000000..53da4b720 Binary files /dev/null and b/assets/hbm/textures/items/cap_fritz.png differ diff --git a/assets/hbm/textures/items/cap_korl.png b/assets/hbm/textures/items/cap_korl.png new file mode 100644 index 000000000..9c801e3d5 Binary files /dev/null and b/assets/hbm/textures/items/cap_korl.png differ diff --git a/assets/hbm/textures/items/cap_nuka.png b/assets/hbm/textures/items/cap_nuka.png new file mode 100644 index 000000000..a8bffedf1 Binary files /dev/null and b/assets/hbm/textures/items/cap_nuka.png differ diff --git a/assets/hbm/textures/items/cap_quantum.png b/assets/hbm/textures/items/cap_quantum.png new file mode 100644 index 000000000..10f1c6feb Binary files /dev/null and b/assets/hbm/textures/items/cap_quantum.png differ diff --git a/assets/hbm/textures/items/cap_template.png b/assets/hbm/textures/items/cap_template.png new file mode 100644 index 000000000..b3a3e055e Binary files /dev/null and b/assets/hbm/textures/items/cap_template.png differ diff --git a/assets/hbm/textures/items/ring_pull.png b/assets/hbm/textures/items/ring_pull.png new file mode 100644 index 000000000..55753105e Binary files /dev/null and b/assets/hbm/textures/items/ring_pull.png differ diff --git a/assets/hbm/textures/models/textureIGen.png b/assets/hbm/textures/models/textureIGen.png index 55af3abe5..70fc5d7f3 100755 Binary files a/assets/hbm/textures/models/textureIGen.png and b/assets/hbm/textures/models/textureIGen.png differ diff --git a/com/hbm/blocks/bomb/NukeCustom.java b/com/hbm/blocks/bomb/NukeCustom.java index 55d82daec..b3dbebde9 100644 --- a/com/hbm/blocks/bomb/NukeCustom.java +++ b/com/hbm/blocks/bomb/NukeCustom.java @@ -162,6 +162,9 @@ public class NukeCustom extends BlockContainer implements IBomb { amat += (hydro/2); schrab += (amat/2); + if(schrab > 300) + schrab = 300; + EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world); entity.posX = x + 0.5; entity.posY = y + 0.5; @@ -184,6 +187,9 @@ public class NukeCustom extends BlockContainer implements IBomb { hydro += (nuke/2); amat += (hydro/2); + if(amat > 350) + amat = 350; + EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world); entity.posX = x + 0.5; entity.posY = y + 0.5; @@ -231,6 +237,9 @@ public class NukeCustom extends BlockContainer implements IBomb { nuke += (tnt/2); hydro += (nuke/2); + if(hydro > 350) + hydro = 350; + EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world); entity.posX = x + 0.5; entity.posY = y + 0.5; @@ -277,6 +286,9 @@ public class NukeCustom extends BlockContainer implements IBomb { } else if(nuke > 0) { nuke += (tnt/2); + if(nuke > 350) + nuke = 350; + EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world); entity.posX = x + 0.5; entity.posY = y + 0.5; @@ -321,6 +333,9 @@ public class NukeCustom extends BlockContainer implements IBomb { } } else if(tnt > 0) { + + if(tnt > 100) + tnt = 100; //world.newExplosion((Entity)null, x + 0.5F, y + 0.5F, z + 0.5F, tnt, field_149933_a.nextInt(5) == 0 ? true : false, true); ExplosionLarge.explode(world, x, y, z, tnt, true, true, true); } diff --git a/com/hbm/entity/missile/EntityMissileAntiBallistic.java b/com/hbm/entity/missile/EntityMissileAntiBallistic.java index 3f087a50b..311a67bef 100644 --- a/com/hbm/entity/missile/EntityMissileAntiBallistic.java +++ b/com/hbm/entity/missile/EntityMissileAntiBallistic.java @@ -179,7 +179,7 @@ public class EntityMissileAntiBallistic extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntityDSmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileBase.java b/com/hbm/entity/missile/EntityMissileBase.java index db8b0f104..683290d67 100644 --- a/com/hbm/entity/missile/EntityMissileBase.java +++ b/com/hbm/entity/missile/EntityMissileBase.java @@ -225,7 +225,7 @@ public class EntityMissileBase extends EntityThrowable { break; } - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileBunkerBuster.java b/com/hbm/entity/missile/EntityMissileBunkerBuster.java index 224b9bbcb..382fe1f1f 100644 --- a/com/hbm/entity/missile/EntityMissileBunkerBuster.java +++ b/com/hbm/entity/missile/EntityMissileBunkerBuster.java @@ -140,7 +140,7 @@ public class EntityMissileBunkerBuster extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileBurst.java b/com/hbm/entity/missile/EntityMissileBurst.java index 51318b166..e2f46f568 100644 --- a/com/hbm/entity/missile/EntityMissileBurst.java +++ b/com/hbm/entity/missile/EntityMissileBurst.java @@ -141,7 +141,7 @@ public class EntityMissileBurst extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileBusterStrong.java b/com/hbm/entity/missile/EntityMissileBusterStrong.java index 7618c1d77..13634b5a2 100644 --- a/com/hbm/entity/missile/EntityMissileBusterStrong.java +++ b/com/hbm/entity/missile/EntityMissileBusterStrong.java @@ -141,7 +141,7 @@ public class EntityMissileBusterStrong extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileCluster.java b/com/hbm/entity/missile/EntityMissileCluster.java index 530ce9080..daa5faa12 100644 --- a/com/hbm/entity/missile/EntityMissileCluster.java +++ b/com/hbm/entity/missile/EntityMissileCluster.java @@ -136,7 +136,7 @@ public class EntityMissileCluster extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileClusterStrong.java b/com/hbm/entity/missile/EntityMissileClusterStrong.java index ecfa094bb..5a8e75b09 100644 --- a/com/hbm/entity/missile/EntityMissileClusterStrong.java +++ b/com/hbm/entity/missile/EntityMissileClusterStrong.java @@ -137,7 +137,7 @@ public class EntityMissileClusterStrong extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileDrill.java b/com/hbm/entity/missile/EntityMissileDrill.java index 81fbbc0b2..23409638c 100644 --- a/com/hbm/entity/missile/EntityMissileDrill.java +++ b/com/hbm/entity/missile/EntityMissileDrill.java @@ -141,7 +141,7 @@ public class EntityMissileDrill extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileEndo.java b/com/hbm/entity/missile/EntityMissileEndo.java index ca012f2ca..4cbd6a343 100644 --- a/com/hbm/entity/missile/EntityMissileEndo.java +++ b/com/hbm/entity/missile/EntityMissileEndo.java @@ -141,7 +141,7 @@ public class EntityMissileEndo extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileExo.java b/com/hbm/entity/missile/EntityMissileExo.java index cc5b44797..d4b3be99c 100644 --- a/com/hbm/entity/missile/EntityMissileExo.java +++ b/com/hbm/entity/missile/EntityMissileExo.java @@ -141,7 +141,7 @@ public class EntityMissileExo extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileGeneric.java b/com/hbm/entity/missile/EntityMissileGeneric.java index 8963fbdb9..f840bd8b7 100644 --- a/com/hbm/entity/missile/EntityMissileGeneric.java +++ b/com/hbm/entity/missile/EntityMissileGeneric.java @@ -140,7 +140,7 @@ public class EntityMissileGeneric extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileIncendiary.java b/com/hbm/entity/missile/EntityMissileIncendiary.java index 958b01a2c..11f9e9700 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiary.java +++ b/com/hbm/entity/missile/EntityMissileIncendiary.java @@ -143,7 +143,7 @@ public class EntityMissileIncendiary extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java index ac1d0b5c4..1e2ba44f9 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java +++ b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java @@ -143,7 +143,7 @@ public class EntityMissileIncendiaryStrong extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileInferno.java b/com/hbm/entity/missile/EntityMissileInferno.java index bf0fc7f81..489797b66 100644 --- a/com/hbm/entity/missile/EntityMissileInferno.java +++ b/com/hbm/entity/missile/EntityMissileInferno.java @@ -143,7 +143,7 @@ public class EntityMissileInferno extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileMirv.java b/com/hbm/entity/missile/EntityMissileMirv.java index a21990d2a..4e44436ad 100644 --- a/com/hbm/entity/missile/EntityMissileMirv.java +++ b/com/hbm/entity/missile/EntityMissileMirv.java @@ -140,7 +140,7 @@ public class EntityMissileMirv extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileNuclear.java b/com/hbm/entity/missile/EntityMissileNuclear.java index 42b20c1e0..16143e172 100644 --- a/com/hbm/entity/missile/EntityMissileNuclear.java +++ b/com/hbm/entity/missile/EntityMissileNuclear.java @@ -143,7 +143,7 @@ public class EntityMissileNuclear extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileRain.java b/com/hbm/entity/missile/EntityMissileRain.java index e9e9ed23a..f1628f9f0 100644 --- a/com/hbm/entity/missile/EntityMissileRain.java +++ b/com/hbm/entity/missile/EntityMissileRain.java @@ -137,7 +137,7 @@ public class EntityMissileRain extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/missile/EntityMissileStrong.java b/com/hbm/entity/missile/EntityMissileStrong.java index 2f6a877e2..f2986f9c4 100644 --- a/com/hbm/entity/missile/EntityMissileStrong.java +++ b/com/hbm/entity/missile/EntityMissileStrong.java @@ -141,7 +141,7 @@ public class EntityMissileStrong extends EntityMissileBase { this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0)); - if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water) { if(!this.worldObj.isRemote) { diff --git a/com/hbm/entity/projectile/EntityBaleflare.java b/com/hbm/entity/projectile/EntityBaleflare.java index 982579d62..657b938a6 100644 --- a/com/hbm/entity/projectile/EntityBaleflare.java +++ b/com/hbm/entity/projectile/EntityBaleflare.java @@ -3,6 +3,7 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; +import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; @@ -471,6 +472,12 @@ public class EntityBaleflare extends Entity implements IProjectile { this.setPosition(this.posX, this.posY, this.posZ); this.func_145775_I(); } + + if(!this.inGround) + if(!worldObj.isRemote) { + worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX, this.posY - 0.5, this.posZ, 0.0, 0.0, 0.0)); + worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX - this.motionX, this.posY - 0.5 - this.motionY, this.posZ - this.motionZ, 0.0, 0.0, 0.0)); + } } /** diff --git a/com/hbm/gui/MachineRecipes.java b/com/hbm/gui/MachineRecipes.java index 4adc3c5ff..0cee03398 100644 --- a/com/hbm/gui/MachineRecipes.java +++ b/com/hbm/gui/MachineRecipes.java @@ -100,6 +100,16 @@ public class MachineRecipes { return new ItemStack(ModItems.nugget_euphemium, 2, 34); } + if (item == ModItems.rod_quad_euphemium && item2 == ModItems.powder_tennessine + || item == ModItems.powder_tennessine && item2 == ModItems.rod_quad_euphemium) { + return new ItemStack(ModItems.nugget_euphemium, 2, 34); + } + + if (item == ModItems.rod_quad_euphemium && item2 == ModItems.powder_cerium + || item == ModItems.powder_cerium && item2 == ModItems.rod_quad_euphemium) { + return new ItemStack(ModItems.nugget_euphemium, 2, 34); + } + if (item == ModItems.oil_canola && item2 == ModItems.canister_empty || item == ModItems.canister_empty && item2 == ModItems.oil_canola) { return new ItemStack(ModItems.canister_canola); @@ -124,9 +134,6 @@ public class MachineRecipes { new ItemStack(ModItems.cell_empty, 1) }; ItemStack[] test = new ItemStack[] { new ItemStack(Items.apple, 3), new ItemStack(Items.leather, 1), new ItemStack(Items.sugar, 3), new ItemStack(Items.blaze_powder, 2) }; - ItemStack[] euphemium = new ItemStack[] { new ItemStack(ModItems.nugget_euphemium, 1), - new ItemStack(ModItems.nugget_euphemium, 1), new ItemStack(ModItems.nugget_euphemium, 1), - new ItemStack(ModItems.rod_quad_empty, 1) }; ItemStack[] schrabidium = new ItemStack[] { new ItemStack(ModItems.ingot_schrabidium, 1), new ItemStack(ModItems.sulfur, 1), new ItemStack(ModItems.sulfur, 1), new ItemStack(ModItems.cell_empty, 1) }; @@ -186,10 +193,6 @@ public class MachineRecipes { } } - if (item == ModItems.rod_quad_euphemium) { - return euphemium; - } - if (item == ModItems.cell_sas3) { return schrabidium; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 8e9620551..cd1ddcb3b 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -427,6 +427,11 @@ public class ModItems { public static Item bottle2_korl_special; public static Item bottle2_fritz_special; public static Item chocolate_milk; + public static Item cap_nuka; + public static Item cap_quantum; + public static Item cap_korl; + public static Item cap_fritz; + public static Item ring_pull; public static Item rod_empty; public static Item rod_uranium; @@ -773,6 +778,7 @@ public class ModItems { public static Item mask_of_infamy; public static Item schrabidium_hammer; + public static Item bottle_opener; public static Item crowbar; @@ -1237,6 +1243,11 @@ public class ModItems { bottle2_korl_special = new ItemEnergy().setUnlocalizedName("bottle2_korl_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_korl"); bottle2_fritz_special = new ItemEnergy().setUnlocalizedName("bottle2_fritz_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_fritz"); chocolate_milk = new ItemEnergy().setUnlocalizedName("chocolate_milk").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chocolate_milk"); + cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_nuka"); + cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_quantum"); + cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_korl"); + cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_fritz"); + ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ring_pull"); rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_empty"); rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); @@ -1644,6 +1655,7 @@ public class ModItems { cape_vertice = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_vertice").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); + bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener"); euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper"); matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick"); crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar"); @@ -2369,6 +2381,7 @@ public class ModItems { GameRegistry.registerItem(pipe_rusty, pipe_rusty.getUnlocalizedName()); GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName()); GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName()); + GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); //Multitool GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName()); @@ -2423,6 +2436,13 @@ public class ModItems { GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName()); GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName()); + //Money + GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); + GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName()); + GameRegistry.registerItem(cap_korl, cap_korl.getUnlocalizedName()); + GameRegistry.registerItem(cap_fritz, cap_fritz.getUnlocalizedName()); + GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName()); + //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 68b6c7a11..1f18f03f2 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -116,6 +116,7 @@ public class ItemEnergy extends Item { if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk) { if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull)); if (p_77654_1_.stackSize <= 0) { return new ItemStack(ModItems.can_empty); @@ -124,7 +125,8 @@ public class ItemEnergy extends Item { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.can_empty)); } - if(this == ModItems.bottle_cherry || this == ModItems.bottle_nuka || this == ModItems.bottle_quantum) { + if(this == ModItems.bottle_cherry || this == ModItems.bottle_nuka) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_nuka)); if (p_77654_1_.stackSize <= 0) { return new ItemStack(ModItems.bottle_empty); @@ -133,7 +135,28 @@ public class ItemEnergy extends Item { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty)); } - if(this == ModItems.bottle2_korl || this == ModItems.bottle2_fritz || this == ModItems.bottle2_korl_special || this == ModItems.bottle2_fritz_special) { + if(this == ModItems.bottle_quantum) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_quantum)); + if (p_77654_1_.stackSize <= 0) + { + return new ItemStack(ModItems.bottle_empty); + } + + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty)); + } + + if(this == ModItems.bottle2_korl || this == ModItems.bottle2_korl_special) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_korl)); + if (p_77654_1_.stackSize <= 0) + { + return new ItemStack(ModItems.bottle2_empty); + } + + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty)); + } + + if(this == ModItems.bottle2_fritz || this == ModItems.bottle2_fritz_special) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_fritz)); if (p_77654_1_.stackSize <= 0) { return new ItemStack(ModItems.bottle2_empty); @@ -158,6 +181,10 @@ public class ItemEnergy extends Item { public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { + if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart)) + if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) + return p_77659_1_; + p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); return p_77659_1_; } diff --git a/com/hbm/items/food/ItemNugget.java b/com/hbm/items/food/ItemNugget.java index cdd02da67..b6da8bc71 100644 --- a/com/hbm/items/food/ItemNugget.java +++ b/com/hbm/items/food/ItemNugget.java @@ -18,7 +18,7 @@ public class ItemNugget extends ItemFood { public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { if (this == ModItems.gun_moist_nugget) { - list.add("A Moisn-Na...no wait, it's"); + list.add("A Mosin-Na...no wait, it's"); list.add("just a moist nugget."); } } diff --git a/com/hbm/items/gear/WeaponSpecial.java b/com/hbm/items/gear/WeaponSpecial.java index c3ff8fa74..01cc5e84c 100644 --- a/com/hbm/items/gear/WeaponSpecial.java +++ b/com/hbm/items/gear/WeaponSpecial.java @@ -1,6 +1,7 @@ package com.hbm.items.gear; import java.util.List; +import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.items.ModItems; @@ -12,9 +13,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class WeaponSpecial extends ItemSword { + + Random rand = new Random(); public WeaponSpecial(ToolMaterial p_i45356_1_) { super(p_i45356_1_); @@ -36,7 +41,7 @@ public class WeaponSpecial extends ItemSword { public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) { World world = entity.worldObj; - + if(this == ModItems.schrabidium_hammer) { if (!world.isRemote) { @@ -44,6 +49,22 @@ public class WeaponSpecial extends ItemSword { } world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 0.1F); } + + if(this == ModItems.bottle_opener) { + if (!world.isRemote) + { + int i = rand.nextInt(7); + if(i == 0) + entity.addPotionEffect(new PotionEffect(Potion.blindness.id, 5 * 60 * 20, 0)); + if(i == 1) + entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5 * 60 * 20, 2)); + if(i == 2) + entity.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 5 * 60 * 20, 2)); + if(i == 3) + entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 1 * 60 * 20, 0)); + } + world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 1.F); + } if(this == ModItems.ullapool_caber) { if (!world.isRemote) @@ -63,9 +84,6 @@ public class WeaponSpecial extends ItemSword { if(this == ModItems.schrabidium_hammer) { multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)-0.5, 1)); } - if(this == ModItems.ullapool_caber) { - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double) 7, 0)); - } return multimap; } @@ -80,6 +98,10 @@ public class WeaponSpecial extends ItemSword { list.add("High-yield Scottish face removal."); list.add("A sober person would throw it..."); } + if(this == ModItems.bottle_opener) { + list.add("My very own bottle opener."); + list.add("Use with caution!"); + } } } diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index db48c949f..bbdeb0f9d 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; +import com.hbm.main.MainRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -44,12 +45,18 @@ public class ItemCustomLore extends ItemRadioactive { if(this == ModItems.pellet_rtg) { - list.add("RTG fuel pellet for infinite energy! (almost)"); + if(MainRegistry.polaroidID == 11) + list.add("Contains ~100% Pu238 oxide."); + else + list.add("RTG fuel pellet for infinite energy! (almost)"); } if(this == ModItems.pellet_rtg_weak) { - list.add("Cheaper and weaker pellet, now with more U238!"); + if(MainRegistry.polaroidID == 11) + list.add("Meh."); + else + list.add("Cheaper and weaker pellet, now with more U238!"); } if(this == ModItems.pellet_cluster) @@ -341,12 +348,15 @@ public class ItemCustomLore extends ItemRadioactive { if(this == ModItems.dust) { - list.add("I hate dust!"); + if(MainRegistry.polaroidID == 11) + list.add("Another one bites the dust!"); + else + list.add("I hate dust!"); } if(this == ModItems.ingot_combine_steel) { - list.add("\"I mean, it's a verb for crying out loud."); + /*list.add("\"I mean, it's a verb for crying out loud."); list.add("The aliens aren't verbs. They're nouns!\""); list.add("\"Actually, I think it's also the name"); list.add("of some kind of farm equipment, like a"); @@ -357,7 +367,8 @@ public class ItemCustomLore extends ItemRadioactive { list.add("oh yea, it can also mean 'the most advanced"); list.add("form of life in the known universe'.\""); list.add("\"So?\""); - list.add("\"'So?' C'mon man, they're ALIENS!\""); + list.add("\"'So?' C'mon man, they're ALIENS!\"");*/ + list.add("*insert Freeman's Mind reference here*"); } if(this == ModItems.gun_super_shotgun) @@ -377,12 +388,18 @@ public class ItemCustomLore extends ItemRadioactive { if(this == ModItems.crystal_horn) { - list.add("Not an actual horn."); + if(MainRegistry.polaroidID == 11) + list.add("An actual horn"); + else + list.add("Not an actual horn."); } if(this == ModItems.crystal_charred) { - list.add("High quality silicate, slightly burned."); + if(MainRegistry.polaroidID == 11) + list.add("Also a real horn. Weird, right?"); + else + list.add("High quality silicate, slightly burned."); } } diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index d9d04a5de..e52d7039e 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -199,6 +199,8 @@ public class MainRegistry public static ToolMaterial enumToolMaterialPipeRusty = EnumHelper.addToolMaterial("PIPERUSTY", 1, 350, 1.5F, 4.5F, 25); public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 5.5F, 25); + public static ToolMaterial enumToolMaterialBottleOpener = EnumHelper.addToolMaterial("OPENER", 1, 250, 1.5F, 0.5F, 200); + public static ToolMaterial enumToolMaterialMultitool = EnumHelper.addToolMaterial("MULTITOOL", 3, 5000, 25F, 5.5F, 25); //Armor Materials @@ -315,6 +317,7 @@ public class MainRegistry enumToolMaterialSteel.setRepairItem(new ItemStack(ModItems.ingot_steel)); enumToolMaterialAlloy.setRepairItem(new ItemStack(ModItems.ingot_advanced_alloy)); enumToolMaterialCmb.setRepairItem(new ItemStack(ModItems.ingot_combine_steel)); + enumToolMaterialBottleOpener.setRepairItem(new ItemStack(ModItems.plate_steel)); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GUIHandler()); GameRegistry.registerTileEntity(TileEntityTestBombAdvanced.class, "tilentity_testbombadvanced"); @@ -565,6 +568,12 @@ public class MainRegistry OreDictionary.registerOre("oreFluorite", ModBlocks.ore_fluorite); OreDictionary.registerOre("oreLead", ModBlocks.ore_lead); OreDictionary.registerOre("oreBeryllium", ModBlocks.ore_beryllium); + OreDictionary.registerOre("oreAustralium", ModBlocks.ore_australium); + OreDictionary.registerOre("oreWeidanium", ModBlocks.ore_weidanium); + OreDictionary.registerOre("oreReiium", ModBlocks.ore_reiium); + OreDictionary.registerOre("oreUnobtainium", ModBlocks.ore_unobtainium); + OreDictionary.registerOre("oreDaffergon", ModBlocks.ore_daffergon); + OreDictionary.registerOre("oreVerticium", ModBlocks.ore_verticium); OreDictionary.registerOre("oreUranium", ModBlocks.ore_nether_uranium); OreDictionary.registerOre("orePlutonium", ModBlocks.ore_nether_plutonium);