Skip to content

Commit

Permalink
vault door fix, chlorine gas, clouds and cloud grenades
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Aug 19, 2018
1 parent 1706b16 commit 06baf70
Show file tree
Hide file tree
Showing 51 changed files with 870 additions and 120 deletions.
10 changes: 9 additions & 1 deletion assets/hbm/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ death.attack.broadcast=%1$s wurde das Gehirn geschmolzen.
death.attack.ams=%1$s wurde in tödlichen Teilchen gebadet, die von der Menschheit erst benannt werden müssen.
death.attack.amsCore=%1$s wurde vom Feuer einer Singularität verdampft.
death.attack.bang=%1$s wurde in mundgerechte Stücke zerfetzt.
death.attack.pc=%1$s wurde zu einer Pfütze in der pinken Wolke.
death.attack.cloud=%1$s schmolz wie ein Eis in der Sonne.

item.redstone_sword.name=Redstoneschwert
item.big_sword.name=Großes Schwert
Expand Down Expand Up @@ -1016,7 +1018,7 @@ item.grenade_frag.name=Splittergranate
item.grenade_fire.name=Brandsplittergranate
item.grenade_shrapnel.name=Schrapnellgranate
item.grenade_cluster.name=Cluster-Bombe
item.grenade_flare.name=Blendgranate
item.grenade_flare.name=Signalfeuer
item.grenade_electric.name=Blitzbombe
item.grenade_poison.name=Giftgranate
item.grenade_gas.name=Gasgranate
Expand All @@ -1032,6 +1034,8 @@ item.grenade_nuke.name=Mark VI Bohrgranate
item.grenade_nuclear.name=Nuka-Granate
item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate
item.grenade_black_hole.name=Schwarzes-Loch-Granate
item.grenade_cloud.name=Gefäß voll Wolke
item.grenade_pink_cloud.name=Gefäß voll pinker Wolke
item.ullapool_caber.name=Ullapool'sche Stiel

item.rod_uranium_fuel.name=Urankernbrennstoffzelle
Expand Down Expand Up @@ -1485,6 +1489,10 @@ tile.machine_converter_he_rf.name=HE zu RF Konverter
tile.machine_converter_rf_he.name=RF zu HE Konverter
tile.machine_transformer.name=Transformator

tile.vent_chlorine.name=Chlorgas-Auslass
tile.vent_cloud.name=Wolken-Auslass
tile.vent_pink_cloud.name=Pinker Wolken-Auslass

item.schrabidium_hammer.name=Schrabidiumhammer
item.shimmer_sledge.name=Shimmer Sledge
item.shimmer_axe.name=Shimmer Axe
Expand Down
10 changes: 9 additions & 1 deletion assets/hbm/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ death.attack.broadcast=%1$s got their brain melted.
death.attack.ams=%1$s was bathed in deadly particles that have yet to be named by human science.
death.attack.amsCore=%1$s was vaporized in the fire of a singularity.
death.attack.bang=%1$s was blasted into bite-sized pieces.
death.attack.pc=%1$s was reduced to a puddle in the pink cloud.
death.attack.cloud=%1$s melted like a popsicle in the sun.

item.redstone_sword.name=Redstone Sword
item.big_sword.name=Great Sword
Expand Down Expand Up @@ -1016,7 +1018,7 @@ item.grenade_frag.name=Frag Grenade
item.grenade_fire.name=Flame Frag Grenade
item.grenade_shrapnel.name=Shrapnel Grenade
item.grenade_cluster.name=Cluster Bomb
item.grenade_flare.name=Flare Grenade
item.grenade_flare.name=Signal Flare
item.grenade_electric.name=Lightning Bomb
item.grenade_poison.name=Poison Grenade
item.grenade_gas.name=Gas Grenade
Expand All @@ -1032,6 +1034,8 @@ item.grenade_nuke.name=Mark VI Drill Grenade
item.grenade_nuclear.name=Nuka Grenade
item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade
item.grenade_black_hole.name=Black Hole Grenade
item.grenade_cloud.name=Jar of Cloud
item.grenade_pink_cloud.name=Jar of Pink Cloud
item.ullapool_caber.name=Ullapool Caber

item.rod_uranium_fuel.name=Uranium Fuel Rod
Expand Down Expand Up @@ -1485,6 +1489,10 @@ tile.machine_converter_he_rf.name=HE to RF Converter
tile.machine_converter_rf_he.name=RF to HE Converter
tile.machine_transformer.name=Transformer

tile.vent_chlorine.name=Chlorine Vent
tile.vent_cloud.name=Cloud Vent
tile.vent_pink_cloud.name=Pink Cloud Vent

item.schrabidium_hammer.name=Schrabidium Hammer
item.shimmer_sledge.name=Shimmer Sledge
item.shimmer_axe.name=Shimmer Axe
Expand Down
Binary file added assets/hbm/textures/blocks/vent_blank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/blocks/vent_chlorine.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/blocks/vent_cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/blocks/vent_pink_cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chlorine8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/cloud8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/grenade_cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/grenade_pink_cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/jackt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/jackt2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions com/hbm/blocks/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,10 @@ public static void mainRegistry()
public static Block crystal_pulsar;
public static Block taint;

public static Block vent_chlorine;
public static Block vent_cloud;
public static Block vent_pink_cloud;

public static Block mud_block;
public static Fluid mud_fluid;
public static final Material fluidmud = (new MaterialLiquid(MapColor.adobeColor));
Expand Down Expand Up @@ -898,6 +902,10 @@ private static void initializeBlock() {
crystal_pulsar = new CrystalPulsar(Material.iron).setBlockName("crystal_pulsar").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_pulsar");
taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null);

vent_chlorine = new BlockVent(Material.iron).setBlockName("vent_chlorine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_chlorine");
vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud");
vent_pink_cloud = new BlockVent(Material.iron).setBlockName("vent_pink_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_pink_cloud");

statue_elb = new DecoBlockAlt(Material.iron).setBlockName("#null").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
statue_elb_g = new DecoBlockAlt(Material.iron).setBlockName("#void").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
statue_elb_w = new DecoBlockAlt(Material.iron).setBlockName("#ngtv").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
Expand Down Expand Up @@ -1361,6 +1369,9 @@ private static void registerBlock() {
//Other Technical Blocks
GameRegistry.registerBlock(oil_pipe, oil_pipe.getUnlocalizedName());
GameRegistry.registerBlock(drill_pipe, drill_pipe.getUnlocalizedName());
GameRegistry.registerBlock(vent_chlorine, vent_chlorine.getUnlocalizedName());
GameRegistry.registerBlock(vent_cloud, vent_cloud.getUnlocalizedName());
GameRegistry.registerBlock(vent_pink_cloud, vent_pink_cloud.getUnlocalizedName());

//???
GameRegistry.registerBlock(crystal_virus, crystal_virus.getUnlocalizedName());
Expand Down
6 changes: 3 additions & 3 deletions com/hbm/blocks/bomb/BombMulti.java
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public boolean igniteTestBomb(World world, int x, int y, int z)
this.poisonRadius += 15;
break;
case 6:
this.gasCloud += 15;
this.gasCloud += 50;
}
switch(entity.return5type())
{
Expand All @@ -229,7 +229,7 @@ public boolean igniteTestBomb(World world, int x, int y, int z)
this.poisonRadius += 15;
break;
case 6:
this.gasCloud += 15;
this.gasCloud += 50;
}

entity.clearSlots();
Expand All @@ -255,7 +255,7 @@ public boolean igniteTestBomb(World world, int x, int y, int z)

if(this.gasCloud > 0)
{
ExplosionChaos.poison(world, x, y, z, this.gasCloud);
ExplosionChaos.spawnChlorine(world, x, y, z, this.gasCloud, this.gasCloud / 50, 0);
}

this.clusterCount = 0;
Expand Down
42 changes: 42 additions & 0 deletions com/hbm/blocks/generic/BlockVent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.hbm.blocks.generic;

import com.hbm.lib.RefStrings;
import com.hbm.tileentity.deco.TileEntityVent;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

public class BlockVent extends BlockContainer {

@SideOnly(Side.CLIENT)
private IIcon iconTop;

public BlockVent(Material p_i45386_1_) {
super(p_i45386_1_);
}

@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityVent();
}

@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
super.registerBlockIcons(iconRegister);
this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":vent_blank");
}

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metadata) {
return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
}

}
36 changes: 36 additions & 0 deletions com/hbm/entity/grenade/EntityGrenadeCloud.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.hbm.entity.grenade;

import java.util.Random;

import com.hbm.explosion.ExplosionChaos;

import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;

public class EntityGrenadeCloud extends EntityGrenadeBase {

public EntityGrenadeCloud(World p_i1773_1_) {
super(p_i1773_1_);
}

public EntityGrenadeCloud(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
super(p_i1774_1_, p_i1774_2_);
}

public EntityGrenadeCloud(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}

@Override
public void explode() {

if (!this.worldObj.isRemote) {
this.setDead();

this.worldObj.playAuxSFX(2002, (int)Math.round(this.posX), (int)Math.round(this.posY), (int)Math.round(this.posZ), 0);
ExplosionChaos.spawnChlorine(worldObj, posX, posY, posZ, 250, 1.5, 1);
}
}
}
77 changes: 39 additions & 38 deletions com/hbm/entity/grenade/EntityGrenadeGas.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,44 @@
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionLarge;

public class EntityGrenadeGas extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
Random rand = new Random();

public EntityGrenadeGas(World p_i1773_1_)
{
super(p_i1773_1_);
}

public EntityGrenadeGas(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}

public EntityGrenadeGas(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}

@Override
public void explode() {

if (!this.worldObj.isRemote)
{
this.setDead();
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true);
ExplosionChaos.poison(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
//for(int i = 0; 0 < 15; i++) {

ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);

//}
}
}
public class EntityGrenadeGas extends EntityGrenadeBase {
private static final String __OBFID = "CL_00001722";
Random rand = new Random();

public EntityGrenadeGas(World p_i1773_1_) {
super(p_i1773_1_);
}

public EntityGrenadeGas(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
super(p_i1774_1_, p_i1774_2_);
}

public EntityGrenadeGas(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}

@Override
public void explode() {

if (!this.worldObj.isRemote) {
this.setDead();
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true);
// ExplosionChaos.poison(this.worldObj, (int)this.posX,
// (int)this.posY, (int)this.posZ, 5);
// for(int i = 0; 0 < 15; i++) {

/*
* ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ,
* 50); ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY,
* posZ, 50); ExplosionLarge.spawnParticlesRadial(worldObj, posX,
* posY, posZ, 50); ExplosionLarge.spawnParticlesRadial(worldObj,
* posX, posY, posZ, 50);
*/

ExplosionChaos.spawnChlorine(worldObj, posX, posY, posZ, 50, 1.25, 0);

// }
}
}

}
34 changes: 34 additions & 0 deletions com/hbm/entity/grenade/EntityGrenadePC.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.hbm.entity.grenade;

import com.hbm.explosion.ExplosionChaos;

import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;

public class EntityGrenadePC extends EntityGrenadeBase {

public EntityGrenadePC(World p_i1773_1_) {
super(p_i1773_1_);
}

public EntityGrenadePC(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
super(p_i1774_1_, p_i1774_2_);
}

public EntityGrenadePC(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}

@Override
public void explode() {

if (!this.worldObj.isRemote) {
this.setDead();

this.worldObj.playAuxSFX(2002, (int)Math.round(this.posX), (int)Math.round(this.posY), (int)Math.round(this.posZ), 0);
ExplosionChaos.spawnChlorine(worldObj, posX, posY, posZ, 500, 2, 2);
}
}
}
Loading

0 comments on commit 06baf70

Please sign in to comment.