diff --git a/src/main/java/api/hbm/item/IGasMask.java b/src/main/java/api/hbm/item/IGasMask.java index 3b2f802ea..0366f0a17 100644 --- a/src/main/java/api/hbm/item/IGasMask.java +++ b/src/main/java/api/hbm/item/IGasMask.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.util.ArmorRegistry.HazardClass; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,41 +13,41 @@ public interface IGasMask { /** * Returns a list of HazardClasses which can not be protected against by this mask (e.g. chlorine gas for half masks) * @param stack - * @param player + * @param entity * @return an empty list if there's no blacklist */ - public List getBlacklist(ItemStack stack, EntityPlayer player); + public List getBlacklist(ItemStack stack, EntityLivingBase entity); /** * Returns the loaded filter, if there is any * @param stack - * @param player + * @param entity * @return null if no filter is installed */ - public ItemStack getFilter(ItemStack stack, EntityPlayer player); + public ItemStack getFilter(ItemStack stack, EntityLivingBase entity); /** * Checks whether the provided filter can be screwed into the mask, does not take already applied filters into account (those get ejected) * @param stack - * @param player + * @param entity * @param filter * @return */ - public boolean isFilterApplicable(ItemStack stack, EntityPlayer player, ItemStack filter); + public boolean isFilterApplicable(ItemStack stack, EntityLivingBase entity, ItemStack filter); /** * This will write the filter to the stack's NBT, it ignores any previously installed filter and won't eject those * @param stack - * @param player + * @param entity * @param filter */ - public void installFilter(ItemStack stack, EntityPlayer player, ItemStack filter); + public void installFilter(ItemStack stack, EntityLivingBase entity, ItemStack filter); /** * Damages the installed filter, if there is one * @param stack - * @param player + * @param entity * @param damage */ - public void damageFilter(ItemStack stack, EntityPlayer player, int damage); + public void damageFilter(ItemStack stack, EntityLivingBase entity, int damage); } diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index bff27ae07..de02204a1 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1052,7 +1052,9 @@ public class ModBlocks { public static Block gas_radon_tomb; public static Block gas_monoxide; public static Block gas_asbestos; + public static Block gas_coal; public static Block gas_flammable; + public static Block gas_explosive; public static Block absorber; public static Block absorber_red; @@ -2008,7 +2010,9 @@ public class ModBlocks { gas_radon_tomb = new BlockGasRadonTomb().setBlockName("gas_radon_tomb").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_radon_tomb"); gas_monoxide = new BlockGasMonoxide().setBlockName("gas_monoxide").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_monoxide"); gas_asbestos = new BlockGasAsbestos().setBlockName("gas_asbestos").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_asbestos"); + gas_coal = new BlockGasAsbestos().setBlockName("gas_coal").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_coal"); gas_flammable = new BlockGasFlammable().setBlockName("gas_flammable").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_flammable"); + gas_explosive = new BlockGasExplosive().setBlockName("gas_explosive").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_explosive"); absorber = new BlockAbsorber(Material.iron, 2.5F).setBlockName("absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber"); absorber_red = new BlockAbsorber(Material.iron, 10F).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_red"); @@ -3020,7 +3024,9 @@ public class ModBlocks { GameRegistry.registerBlock(gas_radon_tomb, gas_radon_tomb.getUnlocalizedName()); GameRegistry.registerBlock(gas_monoxide, gas_monoxide.getUnlocalizedName()); GameRegistry.registerBlock(gas_asbestos, gas_asbestos.getUnlocalizedName()); + GameRegistry.registerBlock(gas_coal, gas_coal.getUnlocalizedName()); GameRegistry.registerBlock(gas_flammable, gas_flammable.getUnlocalizedName()); + GameRegistry.registerBlock(gas_explosive, gas_explosive.getUnlocalizedName()); //??? GameRegistry.registerBlock(crystal_virus, crystal_virus.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java b/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java index 1f2a3c61a..fe1446b2a 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java @@ -2,6 +2,9 @@ package com.hbm.blocks.gas; import java.util.Random; +import com.hbm.extprop.HbmLivingProps; +import com.hbm.util.ArmorRegistry; +import com.hbm.util.ArmorRegistry.HazardClass; import com.hbm.util.ContaminationUtil; import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.HazardType; @@ -32,7 +35,11 @@ public class BlockGasAsbestos extends BlockGasBase { public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if(entity instanceof EntityLivingBase) { - ContaminationUtil.contaminate((EntityLivingBase)entity, HazardType.ASBESTOS, ContaminationType.GAS, 1); + + EntityLivingBase living = (EntityLivingBase) entity; + + if(!ArmorRegistry.hasProtection(living, 3, HazardClass.PARTICLE_COARSE)) + HbmLivingProps.incrementAsbestos(living, 1); } } diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasExplosive.java b/src/main/java/com/hbm/blocks/gas/BlockGasExplosive.java new file mode 100644 index 000000000..a8673404e --- /dev/null +++ b/src/main/java/com/hbm/blocks/gas/BlockGasExplosive.java @@ -0,0 +1,11 @@ +package com.hbm.blocks.gas; + +import net.minecraft.init.Blocks; +import net.minecraft.world.World; + +public class BlockGasExplosive extends BlockGasFlammable { + + protected void combust(World world, int x, int y, int z) { + world.newExplosion(null, x + 0.5, y + 0.5, z + 0.5, 3F, true, false); + } +} diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java b/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java index 18d119759..aef3dbdb6 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java @@ -2,6 +2,8 @@ package com.hbm.blocks.gas; import java.util.Random; +import com.hbm.interfaces.Untested; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -37,8 +39,8 @@ public class BlockGasFlammable extends BlockGasBase { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Block b = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); - if(b == Blocks.fire || b.getMaterial() == Material.lava || b == Blocks.torch) { - world.setBlock(x, y, z, Blocks.fire); + if(isFireSource(b)) { + combust(world, x, y, z); return; } } @@ -52,10 +54,33 @@ public class BlockGasFlammable extends BlockGasBase { super.updateTick(world, x, y, z, rand); } + @Untested + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + Block b = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); + + if(isFireSource(b)) { + world.scheduleBlockUpdate(x, y, z, this, 2); + } + } + } + + protected void combust(World world, int x, int y, int z) { + world.setBlock(x, y, z, Blocks.fire); + } + + public boolean isFireSource(Block b) { + return b.getMaterial() == Material.fire || b.getMaterial() == Material.lava || b == Blocks.torch; + } + + @Override public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } + @Override public int getDelay(World world) { return world.rand.nextInt(5) + 16; } diff --git a/src/main/java/com/hbm/extprop/HbmLivingProps.java b/src/main/java/com/hbm/extprop/HbmLivingProps.java index 97b9e7630..96819a92a 100644 --- a/src/main/java/com/hbm/extprop/HbmLivingProps.java +++ b/src/main/java/com/hbm/extprop/HbmLivingProps.java @@ -32,6 +32,7 @@ public class HbmLivingProps implements IExtendedEntityProperties { private float radiation; private float digamma; private int asbestos; + private int blacklung; private float radEnv; private float radBuf; private int bombTimer; @@ -184,6 +185,25 @@ public class HbmLivingProps implements IExtendedEntityProperties { setAsbestos(entity, getAsbestos(entity) + asbestos); } + + /// BLACK LUNG DISEASE /// + public static int getBlackLung(EntityLivingBase entity) { + return getData(entity).blacklung; + } + + public static void setBlackLung(EntityLivingBase entity, int blacklung) { + getData(entity).blacklung = blacklung; + + if(blacklung >= 60 * 60 * 20) { + getData(entity).asbestos = 0; + entity.attackEntityFrom(ModDamageSource.asbestos, 1000); + } + } + + public static void incrementBlackLung(EntityLivingBase entity, int blacklung) { + setBlackLung(entity, getBlackLung(entity) + blacklung); + } + /// TIME BOMB /// public static int getTimer(EntityLivingBase entity) { return getData(entity).bombTimer; diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index cddb79d39..19c4676d8 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -82,6 +82,8 @@ public class FluidTypeHandler { WASTEFLUID (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.NO_CONTAINER), WASTEGAS (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.NO_CONTAINER), + GASOLINE (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"), + PLASMA_DT (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), PLASMA_HD (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), PLASMA_HT (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index da167e4fb..9ca66c8c8 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -42,6 +42,7 @@ public class FluidContainerRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), FluidType.GASOLINE, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index f5999f1bf..b622dc1c0 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -1743,6 +1743,9 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.oil_tar, 1)); list.add(new ItemStack(ModItems.powder_lead, 1)); break; + case GASOLINE: + list.add(new ItemStack(ModItems.antiknock, 1)); + break; default: break; } @@ -1979,6 +1982,9 @@ public class MachineRecipes { input[0] = new FluidStack(100, FluidType.PETROLEUM); input[1] = new FluidStack(1000, FluidType.STEAM); break; + case GASOLINE: + input[0] = new FluidStack(10000, FluidType.PETROIL); + break; default: break; } @@ -2274,6 +2280,9 @@ public class MachineRecipes { case COLTAN_CRYSTAL: output[0] = new FluidStack(250, FluidType.WATER); break; + case GASOLINE: + output[0] = new FluidStack(12000, FluidType.GASOLINE); + break; default: break; } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index 37d7920d5..fda998622 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -36,7 +36,8 @@ public class GUIMachineDiesel extends GuiInfoContainer { " Diesel (500 HE/t)", " Petroil (300 HE/t)", " Biofuel (400 HE/t)", - " Hydrogen (1000 HE/t)", + " Hydrogen (10 HE/t)", + " Leaded Gasoline (1500 HE/t)", " NITAN Superfuel (5000 HE/t)" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java index c64cd708b..14ddaaf3a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -41,6 +41,7 @@ public class GUIMachineSelenium extends GuiInfoContainer { " Reclaimed Oil (100 HE/t)", " Petroil (125 HE/t)", " Biofuel (200 HE/t)", + " Leaded Gasoline (700 HE/t)", " NITAN Superfuel (2500 HE/t)", "(These numbers are base values,", "actual output is based", diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index ad902add2..4a0578c20 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -777,6 +777,7 @@ public class ModItems { public static Item canister_reoil; public static Item canister_petroil; public static Item canister_napalm; + public static Item canister_gasoline; public static Item canister_NITAN; public static Item canister_heavyoil; @@ -2502,10 +2503,10 @@ public class ModItems { plate_iron = new Item().setUnlocalizedName("plate_iron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_iron"); ingot_lead = new Item().setUnlocalizedName("ingot_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lead"); plate_lead = new Item().setUnlocalizedName("plate_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_lead"); - ingot_schraranium = new ItemSchraranium(ItemHazard.sr * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schraranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schraranium"); - ingot_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); - ingot_schrabidate = new ItemHazard(ItemHazard.sa326 * 0.1F * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidate"); - plate_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.ingot, false, true).setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); + ingot_schraranium = new ItemSchraranium().addRadiation(ItemHazard.sr * ItemHazard.ingot).addBlinding().toItem().setUnlocalizedName("ingot_schraranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schraranium"); + ingot_schrabidium = new ItemHazard().addRadiation(ItemHazard.sa326 * ItemHazard.ingot).addBlinding().toItem().setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); + ingot_schrabidate = new ItemHazard().addRadiation(ItemHazard.sb* ItemHazard.ingot).addBlinding().toItem().setUnlocalizedName("ingot_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidate"); + plate_schrabidium = new ItemHazard().addRadiation(ItemHazard.sa326 * ItemHazard.ingot).addBlinding().toItem().setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); plate_copper = new Item().setUnlocalizedName("plate_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_copper"); plate_gold = new Item().setUnlocalizedName("plate_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_gold"); plate_advanced_alloy = new Item().setUnlocalizedName("plate_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_advanced_alloy"); @@ -2532,8 +2533,8 @@ public class ModItems { plate_kevlar = new Item().setUnlocalizedName("plate_kevlar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_kevlar"); plate_dineutronium = new Item().setUnlocalizedName("plate_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_dineutronium"); plate_desh = new Item().setUnlocalizedName("plate_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_desh"); - ingot_solinium = new ItemHazard(ItemHazard.sa327 * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); - nugget_solinium = new ItemHazard(ItemHazard.sa327 * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); + ingot_solinium = new ItemHazard().addRadiation(ItemHazard.sa327 * ItemHazard.ingot).addBlinding().toItem().setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); + nugget_solinium = new ItemHazard().addRadiation(ItemHazard.sa327 * ItemHazard.nugget).addBlinding().toItem().setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); photo_panel = new Item().setUnlocalizedName("photo_panel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":photo_panel"); sat_base = new Item().setUnlocalizedName("sat_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sat_base"); thruster_nuclear = new Item().setUnlocalizedName("thruster_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_nuclear"); @@ -2728,7 +2729,7 @@ public class ModItems { powder_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_au198"); powder_at209 = new ItemHazard().addRadiation(ItemHazard.at209 * ItemHazard.powder).addFire(15).addBlinding().toItem().setUnlocalizedName("powder_at209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_at209"); powder_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); - powder_schrabidate = new ItemHazard(ItemHazard.sa326 * 0.1F * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidate"); + powder_schrabidate = new ItemHazard(ItemHazard.sb * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidate"); powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_aluminium"); powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_beryllium"); powder_copper = new Item().setUnlocalizedName("powder_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_copper"); @@ -3118,6 +3119,7 @@ public class ModItems { canister_reoil = new ItemCustomLore().setUnlocalizedName("canister_reoil").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_reoil"); canister_petroil = new ItemCustomLore().setUnlocalizedName("canister_petroil").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_petroil"); canister_napalm = new ItemCustomLore().setUnlocalizedName("canister_napalm").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_napalm"); + canister_gasoline = new ItemCustomLore().setUnlocalizedName("canister_gasoline").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_gasoline"); canister_NITAN = new ItemCustomLore().setUnlocalizedName("canister_NITAN").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_superfuel"); canister_heavyoil = new ItemCustomLore().setUnlocalizedName("canister_heavyoil").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_heavyoil"); canister_bitumen = new ItemCustomLore().setUnlocalizedName("canister_bitumen").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_bitumen"); @@ -3888,11 +3890,11 @@ public class ModItems { mp_warhead_15_turbine = new ItemMissile().makeWarhead(WarheadType.TURBINE, 200F, 5F, PartSize.SIZE_15).setRarity(Rarity.SEWS_CLOTHES_AND_SUCKS_HORSE_COCK).setHealth(250F).setUnlocalizedName("mp_warhead_15_turbine").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_20_he = new ItemMissile().makeWarhead(WarheadType.HE, 15F, 1F, PartSize.SIZE_20) .setUnlocalizedName("mp_w_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_chip_1 = new ItemMissile().makeChip(0.1F) .setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); - mp_chip_2 = new ItemMissile().makeChip(0.05F) .setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); - mp_chip_3 = new ItemMissile().makeChip(0.01F) .setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); - mp_chip_4 = new ItemMissile().makeChip(0.005F) .setUnlocalizedName("mp_c_4").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_4"); - mp_chip_5 = new ItemMissile().makeChip(0.0F) .setUnlocalizedName("mp_c_5").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_5"); + mp_chip_1 = new ItemMissile().makeChip(0.1F) .setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); + mp_chip_2 = new ItemMissile().makeChip(0.05F) .setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); + mp_chip_3 = new ItemMissile().makeChip(0.01F) .setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); + mp_chip_4 = new ItemMissile().makeChip(0.005F) .setUnlocalizedName("mp_c_4").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_4"); + mp_chip_5 = new ItemMissile().makeChip(0.0F) .setUnlocalizedName("mp_c_5").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_5"); missile_skin_camo = new ItemCustomLore().setUnlocalizedName("missile_skin_camo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_skin_camo"); missile_skin_desert = new ItemCustomLore().setUnlocalizedName("missile_skin_desert").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_skin_desert"); @@ -4257,34 +4259,34 @@ public class ModItems { flame_opinion = new ItemCustomLore().setUnlocalizedName("flame_opinion").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_opinion"); gadget_explosive = new Item().setUnlocalizedName("gadget_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive"); - gadget_explosive8 = new ItemGadget(0F).setUnlocalizedName("gadget_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); - gadget_wireing = new ItemGadget(0F).setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); - gadget_core = new ItemGadget(5F).setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); + gadget_explosive8 = new ItemGadget().setUnlocalizedName("gadget_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); + gadget_wireing = new ItemGadget().setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); + gadget_core = new ItemGadget().addRadiation(ItemHazard.pu239 * ItemHazard.nugget * 10).toItem().setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); - boy_igniter = new ItemBoy(0F).setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); - boy_propellant = new ItemBoy(0F).setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); - boy_bullet = new ItemBoy(1.5F).setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); - boy_target = new ItemBoy(5.0F).setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); - boy_shielding = new ItemBoy(0F).setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); + boy_igniter = new ItemBoy().setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); + boy_propellant = new ItemBoy().setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); + boy_bullet = new ItemBoy().addRadiation(ItemHazard.u235 * ItemHazard.nugget * 2) .toItem().setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); + boy_target = new ItemBoy().addRadiation(ItemHazard.u235 * ItemHazard.nugget * 8) .toItem().setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); + boy_shielding = new ItemBoy().setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); man_explosive = new Item().setUnlocalizedName("man_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive"); - man_explosive8 = new ItemManMike(0F).setUnlocalizedName("man_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); + man_explosive8 = new ItemManMike().setUnlocalizedName("man_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); man_igniter = new ItemMan().setUnlocalizedName("man_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_igniter"); - man_core = new ItemManMike(5.0F).setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); + man_core = new ItemManMike().addRadiation(ItemHazard.pu239 * ItemHazard.nugget * 10).toItem().setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); - mike_core = new ItemMike(2.5F).setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); - mike_deut = new ItemMike(0F).setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); - mike_cooling_unit = new ItemMike(0F).setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); + mike_core = new ItemMike().addRadiation(ItemHazard.u238 * ItemHazard.nugget * 10).toItem().setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); + mike_deut = new ItemMike().setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); + mike_cooling_unit = new ItemMike().setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); - tsar_core = new ItemTsar(10F).setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); + tsar_core = new ItemTsar().addRadiation(ItemHazard.pu239 * ItemHazard.nugget * 15).toItem().setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); fleija_igniter = new ItemFleija().setUnlocalizedName("fleija_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_igniter"); fleija_propellant = new ItemFleija().addRadiation(15F).addBlinding().toItem().setUnlocalizedName("fleija_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_propellant"); fleija_core = new ItemFleija().addRadiation(10F).toItem().setUnlocalizedName("fleija_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_core"); - solinium_igniter = new ItemSolinium(0F, false).setUnlocalizedName("solinium_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_igniter"); - solinium_propellant = new ItemSolinium(0F, false).setUnlocalizedName("solinium_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_propellant"); - solinium_core = new ItemSolinium(15F, true).setUnlocalizedName("solinium_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_core"); + solinium_igniter = new ItemSolinium().setUnlocalizedName("solinium_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_igniter"); + solinium_propellant = new ItemSolinium().setUnlocalizedName("solinium_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_propellant"); + solinium_core = new ItemSolinium().addRadiation(ItemHazard.sa327 * ItemHazard.nugget * 8).addBlinding().toItem().setUnlocalizedName("solinium_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_core"); n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge"); @@ -6031,6 +6033,7 @@ public class ModItems { GameRegistry.registerItem(canister_petroil, canister_petroil.getUnlocalizedName()); GameRegistry.registerItem(canister_biofuel, canister_biofuel.getUnlocalizedName()); GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName()); + GameRegistry.registerItem(canister_gasoline, canister_gasoline.getUnlocalizedName()); GameRegistry.registerItem(canister_NITAN, canister_NITAN.getUnlocalizedName()); //Gas Tanks diff --git a/src/main/java/com/hbm/items/armor/ArmorGasMask.java b/src/main/java/com/hbm/items/armor/ArmorGasMask.java index aa4d00fa8..2e827d32d 100644 --- a/src/main/java/com/hbm/items/armor/ArmorGasMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorGasMask.java @@ -140,7 +140,7 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { } @Override - public List getBlacklist(ItemStack stack, EntityPlayer player) { + public List getBlacklist(ItemStack stack, EntityLivingBase entity) { if(this == ModItems.gas_mask_mono) { return Arrays.asList(new HazardClass[] {HazardClass.GAS_CHLORINE, HazardClass.GAS_CORROSIVE, HazardClass.NERVE_AGENT, HazardClass.BACTERIA}); @@ -150,17 +150,17 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { } @Override - public ItemStack getFilter(ItemStack stack, EntityPlayer player) { + public ItemStack getFilter(ItemStack stack, EntityLivingBase entity) { return ArmorUtil.getGasMaskFilter(stack); } @Override - public void installFilter(ItemStack stack, EntityPlayer player, ItemStack filter) { + public void installFilter(ItemStack stack, EntityLivingBase entity, ItemStack filter) { ArmorUtil.installGasMaskFilter(stack, filter); } @Override - public void damageFilter(ItemStack stack, EntityPlayer player, int damage) { + public void damageFilter(ItemStack stack, EntityLivingBase entity, int damage) { ArmorUtil.damageGasMaskFilter(stack, damage); } @@ -181,7 +181,7 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { } @Override - public boolean isFilterApplicable(ItemStack stack, EntityPlayer player, ItemStack filter) { + public boolean isFilterApplicable(ItemStack stack, EntityLivingBase entity, ItemStack filter) { return true; } } diff --git a/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java b/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java index 0a823c6d1..ad850dc9c 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java @@ -39,22 +39,22 @@ public class ArmorHazmatMask extends ArmorHazmat implements IGasMask { } @Override - public List getBlacklist(ItemStack stack, EntityPlayer player) { + public List getBlacklist(ItemStack stack, EntityLivingBase entity) { return new ArrayList(); // full hood has no restrictions } @Override - public ItemStack getFilter(ItemStack stack, EntityPlayer player) { + public ItemStack getFilter(ItemStack stack, EntityLivingBase entity) { return ArmorUtil.getGasMaskFilter(stack); } @Override - public void installFilter(ItemStack stack, EntityPlayer player, ItemStack filter) { + public void installFilter(ItemStack stack, EntityLivingBase entity, ItemStack filter) { ArmorUtil.installGasMaskFilter(stack, filter); } @Override - public void damageFilter(ItemStack stack, EntityPlayer player, int damage) { + public void damageFilter(ItemStack stack, EntityLivingBase entity, int damage) { ArmorUtil.damageGasMaskFilter(stack, damage); } @@ -64,7 +64,7 @@ public class ArmorHazmatMask extends ArmorHazmat implements IGasMask { } @Override - public boolean isFilterApplicable(ItemStack stack, EntityPlayer player, ItemStack filter) { + public boolean isFilterApplicable(ItemStack stack, EntityLivingBase entity, ItemStack filter) { return true; } } diff --git a/src/main/java/com/hbm/items/bomb/ItemBoy.java b/src/main/java/com/hbm/items/bomb/ItemBoy.java index 117414987..4db11eb3d 100644 --- a/src/main/java/com/hbm/items/bomb/ItemBoy.java +++ b/src/main/java/com/hbm/items/bomb/ItemBoy.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemBoy extends ItemHazard { - - public ItemBoy(float radiation) { - super(radiation); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/bomb/ItemGadget.java b/src/main/java/com/hbm/items/bomb/ItemGadget.java index b48969544..07d8441e6 100644 --- a/src/main/java/com/hbm/items/bomb/ItemGadget.java +++ b/src/main/java/com/hbm/items/bomb/ItemGadget.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemGadget extends ItemHazard { - - public ItemGadget(float radiation) { - super(radiation); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/bomb/ItemManMike.java b/src/main/java/com/hbm/items/bomb/ItemManMike.java index 4474ca526..c045b3c58 100644 --- a/src/main/java/com/hbm/items/bomb/ItemManMike.java +++ b/src/main/java/com/hbm/items/bomb/ItemManMike.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemManMike extends ItemHazard { - - public ItemManMike(float radiation) { - super(radiation); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/bomb/ItemMike.java b/src/main/java/com/hbm/items/bomb/ItemMike.java index ee1f78d0f..fcde3c376 100644 --- a/src/main/java/com/hbm/items/bomb/ItemMike.java +++ b/src/main/java/com/hbm/items/bomb/ItemMike.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemMike extends ItemHazard { - - public ItemMike(float radiation) { - super(radiation); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/bomb/ItemSolinium.java b/src/main/java/com/hbm/items/bomb/ItemSolinium.java index 96ebe3997..0007af8e0 100644 --- a/src/main/java/com/hbm/items/bomb/ItemSolinium.java +++ b/src/main/java/com/hbm/items/bomb/ItemSolinium.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemSolinium extends ItemHazard { - - public ItemSolinium(float radiation, boolean blinding) { - super(radiation, false, blinding); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/bomb/ItemTsar.java b/src/main/java/com/hbm/items/bomb/ItemTsar.java index 9110306ef..3cdd317bc 100644 --- a/src/main/java/com/hbm/items/bomb/ItemTsar.java +++ b/src/main/java/com/hbm/items/bomb/ItemTsar.java @@ -8,10 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemTsar extends ItemHazard { - - public ItemTsar(float radiation) { - super(radiation); - } @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) diff --git a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java index 9eb581123..d86d021cb 100644 --- a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java @@ -99,7 +99,8 @@ public class ItemChemistryTemplate extends Item { COLTAN_CRYSTAL, VIT_LIQUID, VIT_GAS, - TEL; + TEL, + GASOLINE; public static EnumChemistryTemplate getEnum(int i) { if(i < EnumChemistryTemplate.values().length) @@ -289,6 +290,10 @@ public class ItemChemistryTemplate extends Item { return 100; case VIT_GAS: return 100; + case TEL: + return 40; + case GASOLINE: + return 40; default: return 100; } diff --git a/src/main/java/com/hbm/items/machine/ItemFuelRod.java b/src/main/java/com/hbm/items/machine/ItemFuelRod.java index 8fa58bc8a..954677665 100644 --- a/src/main/java/com/hbm/items/machine/ItemFuelRod.java +++ b/src/main/java/com/hbm/items/machine/ItemFuelRod.java @@ -16,10 +16,14 @@ public class ItemFuelRod extends ItemHazard { public int heat; public ItemFuelRod(float radiation, boolean blinding, int life, int heat) { - super(radiation, false, blinding); + super(); this.lifeTime = life; this.heat = heat; this.canRepair = false; + + this.addRadiation(radiation); + if(blinding) + this.addBlinding(); } @Override diff --git a/src/main/java/com/hbm/items/special/ItemHazard.java b/src/main/java/com/hbm/items/special/ItemHazard.java index 26328328f..c4640ed3e 100644 --- a/src/main/java/com/hbm/items/special/ItemHazard.java +++ b/src/main/java/com/hbm/items/special/ItemHazard.java @@ -68,11 +68,13 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard { public static final float sa326 = 15.0F; public static final float sa327 = 17.5F; public static final float saf = 5.85F; - public static final float pobe = 37.5F; - public static final float rabe = 3.75F; - public static final float pube = 5.0F; + public static final float radsource_mult = 0.5F; + public static final float pobe = po210 * radsource_mult; + public static final float rabe = ra226 * radsource_mult; + public static final float pube = pu238 * radsource_mult; public static final float sr = sa326 * 0.1F; + public static final float sb = sa326 * 0.1F; public static final float trx = 25.0F; public static final float trn = 0.1F; public static final float wst = 15.0F; @@ -81,8 +83,9 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard { public static final float nugget = 0.1F; public static final float ingot = 1.0F; - public static final float powder = ingot; - public static final float powder_tiny = nugget; + public static final float powder_mult = 3.0F; + public static final float powder = ingot * powder_mult; + public static final float powder_tiny = nugget * powder_mult; public static final float block = 10.0F; public static final float crystal = block; public static final float billet = 0.5F; diff --git a/src/main/java/com/hbm/items/special/ItemSchraranium.java b/src/main/java/com/hbm/items/special/ItemSchraranium.java index 6019faeb9..45a42c6ec 100644 --- a/src/main/java/com/hbm/items/special/ItemSchraranium.java +++ b/src/main/java/com/hbm/items/special/ItemSchraranium.java @@ -12,10 +12,6 @@ public class ItemSchraranium extends ItemHazard { IIcon nikonium; - public ItemSchraranium(float radiation, boolean fire, boolean blinding) { - super(radiation, fire, blinding); - } - @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister reg) { this.itemIcon = reg.registerIcon(this.getIconString()); diff --git a/src/main/java/com/hbm/items/special/WatzFuel.java b/src/main/java/com/hbm/items/special/WatzFuel.java index 1efb40881..1cddaf704 100644 --- a/src/main/java/com/hbm/items/special/WatzFuel.java +++ b/src/main/java/com/hbm/items/special/WatzFuel.java @@ -26,7 +26,7 @@ public class WatzFuel extends ItemHazard { */ public WatzFuel(float radiation, boolean blinding, int lifeTime, int power, float powerMultiplier, int heat, float heatMultiplier, float decayMultiplier) { - super(radiation, false, blinding); + super(); this.lifeTime = lifeTime * 100; this.power = power/10; this.powerMultiplier = powerMultiplier; @@ -35,6 +35,10 @@ public class WatzFuel extends ItemHazard { this.decayMultiplier = decayMultiplier; this.setMaxDamage(100); this.canRepair = false; + + this.addRadiation(radiation); + if(blinding) + this.addBlinding(); } @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 75cd41eb9..67923be1a 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -511,8 +511,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock_reinforced, 1), new Object[] { " P ", "PBP", "PDP", 'P', "plateAdvanced", 'D', ModItems.plate_desh, 'B', ModItems.bolt_dura_steel })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock_unbreakable, 1), new Object[] { " P ", "PBP", "PDP", 'P', "plateSaturnite", 'D', "gemDiamond", 'B', ModItems.bolt_dura_steel })); - GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustLapis" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_ss, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustAdvanced" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_vc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustCMBSteel" })); diff --git a/src/main/java/com/hbm/packet/AuxGaugePacket.java b/src/main/java/com/hbm/packet/AuxGaugePacket.java index 9f165b3ff..fc765524c 100644 --- a/src/main/java/com/hbm/packet/AuxGaugePacket.java +++ b/src/main/java/com/hbm/packet/AuxGaugePacket.java @@ -36,7 +36,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; -@Spaghetti("Changing all machiines to use TileEntityMachineBase will reduce the total chaos in this class") +@Spaghetti("Changing all machines to use TileEntityMachineBase will reduce the total chaos in this class") +@Deprecated public class AuxGaugePacket implements IMessage { int x; @@ -254,7 +255,6 @@ public class AuxGaugePacket implements IMessage { if(te instanceof TileEntityMachineBase) { - ((TileEntityMachineBase)te).processGauge(m.value, m.id); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 941adf309..d7a2515ea 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -148,6 +148,8 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IS return 300; if(type.name().equals(FluidType.BIOFUEL.name())) return 400; + if(type.name().equals(FluidType.GASOLINE.name())) + return 1500; if(type.name().equals(FluidType.NITAN.name())) return 5000; return 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index ffe1b2311..b64846d51 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -281,6 +281,8 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide return 125; if(type.name().equals(FluidType.BIOFUEL.name())) return 200; + if(type.name().equals(FluidType.GASOLINE.name())) + return 700; if(type.name().equals(FluidType.NITAN.name())) return 2500; return 0; diff --git a/src/main/java/com/hbm/util/ArmorRegistry.java b/src/main/java/com/hbm/util/ArmorRegistry.java index 2ae3c7e86..162289d4d 100644 --- a/src/main/java/com/hbm/util/ArmorRegistry.java +++ b/src/main/java/com/hbm/util/ArmorRegistry.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,12 +16,12 @@ public class ArmorRegistry { hazardClasses.put(item, Arrays.asList(hazards)); } - public static boolean hasAllProtection(EntityPlayer player, int slot, HazardClass... clazz) { + public static boolean hasAllProtection(EntityLivingBase entity, int slot, HazardClass... clazz) { - if(ArmorUtil.checkArmorNull(player, slot)) + if(ArmorUtil.checkArmorNull(entity, slot)) return false; - List list = hazardClasses.get(player.inventory.armorInventory[slot].getItem()); + List list = hazardClasses.get(entity.getEquipmentInSlot(slot + 1).getItem()); if(list == null) return false; @@ -28,12 +29,12 @@ public class ArmorRegistry { return list.containsAll(Arrays.asList(clazz)); } - public static boolean hasAnyProtection(EntityPlayer player, int slot, HazardClass... clazz) { + public static boolean hasAnyProtection(EntityLivingBase entity, int slot, HazardClass... clazz) { - if(ArmorUtil.checkArmorNull(player, slot)) + if(ArmorUtil.checkArmorNull(entity, slot)) return false; - List list = hazardClasses.get(player.inventory.armorInventory[slot].getItem()); + List list = hazardClasses.get(entity.getEquipmentInSlot(slot + 1).getItem()); if(list == null) return false; @@ -45,12 +46,12 @@ public class ArmorRegistry { return false; } - public static boolean hasProtection(EntityPlayer player, int slot, HazardClass clazz) { + public static boolean hasProtection(EntityLivingBase entity, int slot, HazardClass clazz) { - if(ArmorUtil.checkArmorNull(player, slot)) + if(ArmorUtil.checkArmorNull(entity, slot)) return false; - List list = hazardClasses.get(player.inventory.armorInventory[slot].getItem()); + List list = hazardClasses.get(entity.getEquipmentInSlot(slot + 1).getItem()); if(list == null) return false; diff --git a/src/main/java/com/hbm/util/ArmorUtil.java b/src/main/java/com/hbm/util/ArmorUtil.java index 2187005da..da0cc15a2 100644 --- a/src/main/java/com/hbm/util/ArmorUtil.java +++ b/src/main/java/com/hbm/util/ArmorUtil.java @@ -11,6 +11,7 @@ import com.hbm.potion.HbmPotion; import com.hbm.util.ArmorRegistry.HazardClass; import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -31,22 +32,22 @@ public class ArmorUtil { ArmorRegistry.registerHazard(ModItems.gas_mask_filter, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_CHLORINE, HazardClass.BACTERIA); } - public static boolean checkArmor(EntityPlayer player, Item... armor) { + public static boolean checkArmor(EntityLivingBase entity, Item... armor) { for(int i = 0; i < 4; i++) { - if(!checkArmorPiece(player, armor[i], 3 - i)) + if(!checkArmorPiece(entity, armor[i], 3 - i)) return false; } return true; } - public static boolean checkArmorPiece(EntityPlayer player, Item armor, int slot) { - return !checkArmorNull(player, slot) && player.inventory.armorInventory[slot].getItem() == armor; + public static boolean checkArmorPiece(EntityLivingBase entity, Item armor, int slot) { + return !checkArmorNull(entity, slot) && entity.getEquipmentInSlot(slot + 1).getItem() == armor; } - public static boolean checkArmorNull(EntityPlayer player, int slot) { - return player.inventory.armorInventory[slot] == null; + public static boolean checkArmorNull(EntityLivingBase player, int slot) { + return player.getEquipmentInSlot(slot + 1) == null; } public static void damageSuit(EntityPlayer player, int slot, int amount) { diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 91f539c5d..52bfe369f 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -419,6 +419,7 @@ hbmfluid.cryogel=Kryogel hbmfluid.deuterium=Deuterium hbmfluid.diesel=Diesel hbmfluid.gas=Erdgas +hbmfluid.gasoline=Bleibenzin hbmfluid.heatingoil=Heizöl hbmfluid.heavyoil=Schweröl hbmfluid.hotoil=Heißes Rohöl diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e3515621d..821e6f7cb 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -487,6 +487,7 @@ hbmfluid.cryogel=Cryogel hbmfluid.deuterium=Deuterium hbmfluid.diesel=Diesel hbmfluid.gas=Natural Gas +hbmfluid.gasoline=Leaded Gasoline hbmfluid.heatingoil=Heating Oil hbmfluid.heavyoil=Heavy Oil hbmfluid.hotoil=Hot Crude Oil diff --git a/src/main/resources/assets/hbm/textures/gui/fluids2.png b/src/main/resources/assets/hbm/textures/gui/fluids2.png index b99b98385..641b40913 100755 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids2.png and b/src/main/resources/assets/hbm/textures/gui/fluids2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/canister_gasoline.png b/src/main/resources/assets/hbm/textures/items/canister_gasoline.png new file mode 100644 index 000000000..1b466069c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/canister_gasoline.png differ diff --git a/src/main/resources/assets/hbm/textures/misc/overlay_asbestos.png b/src/main/resources/assets/hbm/textures/misc/overlay_asbestos.png index 53d683d04..1af57cdb4 100644 Binary files a/src/main/resources/assets/hbm/textures/misc/overlay_asbestos.png and b/src/main/resources/assets/hbm/textures/misc/overlay_asbestos.png differ