making the voices stop - angle grinder edition

src/main/java/com/hbm/entity/mob/EntityMaskMan.java

@@ -126,7 +126,7 @@ public class EntityMaskMan extends EntityMob implements IBossDisplayData, IRadia
 			
 			this.entityDropItem(mask, 0F);
 			this.dropItem(ModItems.coin_maskman, 1);
-			this.dropItem(ModItems.v1, 1);
+			this.dropItem(ModItems.bottled_cloud, 1);
 			this.dropItem(Items.skull, 1);
 		}
 	}

src/main/java/com/hbm/handler/EntityEffectHandler.java

@@ -670,13 +670,14 @@ public class EntityEffectHandler {
 						player.addVelocity(lookingIn.xCoord * forward + strafeVec.xCoord * strafe, 0, lookingIn.zCoord * forward + strafeVec.zCoord * strafe);
 						player.motionY = 0;
 						player.fallDistance = 0F;
-						player.playSound("hbm:player.dash", 1.0F, 1.0F);
+						player.playSound("hbm:weapon.rocketFlame", 1.0F, 1.0F);
 						
 						props.setDashCooldown(HbmPlayerProps.dashCooldownLength);
 						stamina -= perDash;
 					}
 				} else {	
 					props.setDashCooldown(props.getDashCooldown() - 1);
+					props.setKeyPressed(EnumKeybind.DASH, false);
 				}
 						
 				if(stamina < props.getDashCount() * perDash) {
@@ -684,7 +685,7 @@ public class EntityEffectHandler {
 					
 					if(stamina % perDash == perDash-1) {
 						
-						player.playSound("hbm:player.dashRecharge", 1.0F, (1.0F + ((1F/12F)*(stamina/perDash))));
+						player.playSound("hbm:item.techBoop", 1.0F, (1.0F + ((1F/12F)*(stamina/perDash))));
 						stamina++;
 					}
 				}

src/main/java/com/hbm/handler/pollution/PollutionHandler.java

@@ -21,7 +21,6 @@ import cpw.mods.fml.relauncher.Side;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.monster.IMob;

src/main/java/com/hbm/items/ModItems.java

@@ -2189,7 +2189,7 @@ public class ModItems {
 	public static Item injector_5htp;
 	public static Item injector_knife;
 	public static Item medal_liquidator;
-	public static Item v1;
+	public static Item bottled_cloud;
 	public static Item protection_charm;
 	public static Item meteor_charm;
 	public static Item neutrino_lens;
@@ -3431,7 +3431,7 @@ public class ModItems {
 		injector_5htp = new ItemModAuto().setUnlocalizedName("injector_5htp").setTextureName(RefStrings.MODID + ":injector_5htp");
 		injector_knife = new ItemModKnife().setUnlocalizedName("injector_knife").setTextureName(RefStrings.MODID + ":injector_knife");
 		medal_liquidator = new ItemModMedal().setUnlocalizedName("medal_liquidator").setTextureName(RefStrings.MODID + ":medal_liquidator");
-		v1 = new ItemModV1().setUnlocalizedName("v1").setTextureName(RefStrings.MODID + ":v1");
+		bottled_cloud = new ItemModCloud().setUnlocalizedName("bottled_cloud").setTextureName(RefStrings.MODID + ":bottled_cloud");
 		protection_charm = new ItemModCharm().setUnlocalizedName("protection_charm").setTextureName(RefStrings.MODID + ":protection_charm");
 		meteor_charm = new ItemModCharm().setUnlocalizedName("meteor_charm").setTextureName(RefStrings.MODID + ":meteor_charm");
 		neutrino_lens = new ItemModLens().setUnlocalizedName("neutrino_lens").setTextureName(RefStrings.MODID + ":neutrino_lens");
@@ -7536,7 +7536,7 @@ public class ModItems {
 		GameRegistry.registerItem(coin_worm, coin_worm.getUnlocalizedName());
 		GameRegistry.registerItem(coin_ufo, coin_ufo.getUnlocalizedName());
 		GameRegistry.registerItem(medal_liquidator, medal_liquidator.getUnlocalizedName());
-		GameRegistry.registerItem(v1, v1.getUnlocalizedName());
+		GameRegistry.registerItem(bottled_cloud, bottled_cloud.getUnlocalizedName());
 		GameRegistry.registerItem(protection_charm, protection_charm.getUnlocalizedName());
 		GameRegistry.registerItem(meteor_charm, meteor_charm.getUnlocalizedName());
 		GameRegistry.registerItem(neutrino_lens, neutrino_lens.getUnlocalizedName());

src/main/java/com/hbm/items/armor/ArmorFSB.java

@@ -476,46 +476,6 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel {
 				} catch(Exception x) {
 				}
 			}
-			/*
-			if(dashCount > 0) {
-				
-				int perDash = 60;
-				
-				HbmPlayerProps props = (HbmPlayerProps) player.getExtendedProperties("NTM_EXT_PLAYER");
-				
-				props.setDashCount(dashCount);
-				
-				int stamina = props.getStamina();
-
-				if(props.getDashCooldown() <= 0) {
-					
-					if(!player.capabilities.isFlying && player.isSneaking() && stamina >= perDash) {
-						
-						Vec3 lookingIn = player.getLookVec();
-						lookingIn.yCoord = 0;
-						lookingIn.normalize();
-						player.addVelocity(lookingIn.xCoord, 0, lookingIn.zCoord);
-						player.playSound("hbm:player.dash", 1.0F, 1.0F);
-						
-						props.setDashCooldown(HbmPlayerProps.dashCooldownLength);
-						stamina -= perDash;
-					}
-				} else {	
-					props.setDashCooldown(props.getDashCooldown() - 1);
-				}
-				
-				if(stamina < props.getDashCount() * perDash) {
-					stamina++;
-					
-					if(stamina % perDash == perDash-1) {
-						
-						player.playSound("hbm:player.dashRecharge", 1.0F, (1.0F + ((1F/12F)*(stamina/perDash))));
-						stamina++;
-					}
-				}
-				
-				props.setStamina(stamina);
-			}	*/
 		}
 	}
 

src/main/java/com/hbm/items/armor/ItemModCloud.java

@@ -13,32 +13,32 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-public class ItemModV1 extends ItemArmorMod implements IArmorModDash {
+public class ItemModCloud extends ItemArmorMod implements IArmorModDash {
 	
 	private static final UUID speed = UUID.fromString("1d11e63e-28c4-4e14-b09f-fe0bd1be708f");
 
-	public ItemModV1() {
+	public ItemModCloud() {
 		super(ArmorModHandler.plate_only, false, true, false, false);
 	}
 	
 	@Override
 	public Multimap getModifiers(ItemStack armor) {
 		Multimap multimap = super.getAttributeModifiers(armor);
-		multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(speed, "V1 SPEED", 0.5, 2));
+		multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(speed, "CLOUD SPEED", 0.125, 2));
 		return multimap;
 	}
 
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
 		
-		list.add(EnumChatFormatting.RED + "BLOOD IS FUEL");
+		list.add(EnumChatFormatting.WHITE + "Grants horizontal dashes");
 		list.add("");
 		super.addInformation(stack, player, list, bool);
 	}
 
 	@Override
 	public void addDesc(List list, ItemStack stack, ItemStack armor) {
-		list.add(EnumChatFormatting.RED + "  " + stack.getDisplayName() + " (BLOOD IS FUEL)");
+		list.add(EnumChatFormatting.RED + "  " + stack.getDisplayName() + " (Dashes)");
 	}
 	
 	public int getDashes() {

src/main/java/com/hbm/main/MainRegistry.java

@@ -1328,6 +1328,7 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:tile.ore_meteor_lithium");
 		ignoreMappings.add("hbm:tile.ore_meteor_starmetal");
 		ignoreMappings.add("hbm:tile.machine_generator");
+		ignoreMappings.add("hbm:item.v1");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

src/main/java/com/hbm/main/ModEventHandler.java

@@ -54,7 +54,6 @@ import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.PermaSyncPacket;
 import com.hbm.packet.PlayerInformPacket;
@@ -68,7 +67,6 @@ import com.hbm.util.ArmorRegistry;
 import com.hbm.util.ArmorUtil;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.EnchantmentUtil;
-import com.hbm.util.EntityDamageUtil;
 import com.hbm.util.EnumUtil;
 import com.hbm.util.InventoryUtil;
 import com.hbm.util.ShadyUtil;
@@ -83,7 +81,6 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
@@ -341,22 +338,6 @@ public class ModEventHandler {
 		
 		EntityLivingBase entity = event.entityLiving;
 		
-		if(EntityDamageUtil.wasAttackedByV1(event.source)) {
-
-			NBTTagCompound vdat = new NBTTagCompound();
-			vdat.setString("type", "giblets");
-			vdat.setInteger("ent", entity.getEntityId());
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(vdat, entity.posX, entity.posY + entity.height * 0.5, entity.posZ), new TargetPoint(entity.dimension, entity.posX, entity.posY + entity.height * 0.5, entity.posZ, 150));
-			
-			entity.worldObj.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.zombie.woodbreak", 2.0F, 0.95F + entity.worldObj.rand.nextFloat() * 0.2F);
-			
-			EntityPlayer attacker = (EntityPlayer) ((EntityDamageSource)event.source).getEntity();
-			
-			if(attacker.getDistanceSqToEntity(entity) < 100) {
-				attacker.heal(entity.getMaxHealth() * 0.25F);
-			}
-		}
-		
 		if(event.entityLiving instanceof EntityPlayer) {
 			
 			EntityPlayer player = (EntityPlayer) event.entityLiving;
@@ -768,23 +749,6 @@ public class ModEventHandler {
 		if(HbmLivingProps.getContagion(e) > 0 && event.ammount < 100)
 			event.ammount *= 2F;
 		
-		/// V1 ///
-		if(EntityDamageUtil.wasAttackedByV1(event.source)) {
-			EntityPlayer attacker = (EntityPlayer) ((EntityDamageSource)event.source).getEntity();
-			
-			NBTTagCompound data = new NBTTagCompound();
-			data.setString("type", "vanillaburst");
-			data.setInteger("count", (int)Math.min(e.getMaxHealth() / 2F, 250));
-			data.setDouble("motion", 0.1D);
-			data.setString("mode", "blockdust");
-			data.setInteger("block", Block.getIdFromBlock(Blocks.redstone_block));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, e.posX, e.posY + e.height * 0.5, e.posZ), new TargetPoint(e.dimension, e.posX, e.posY, e.posZ, 50));
-			
-			if(attacker.getDistanceSqToEntity(e) < 25) {
-				attacker.heal(event.ammount * 0.5F);
-			}
-		}
-		
 		/// ARMOR MODS ///
 		for(int i = 1; i < 5; i++) {
 			

src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOilburner.java

@@ -5,7 +5,6 @@ import com.hbm.inventory.container.ContainerOilburner;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Flammable;
-import com.hbm.inventory.fluid.trait.FT_Polluting;
 import com.hbm.inventory.fluid.trait.FluidTrait.FluidReleaseType;
 import com.hbm.inventory.gui.GUIOilburner;
 import com.hbm.lib.Library;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java

@@ -7,7 +7,6 @@ import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
-import com.hbm.inventory.fluid.trait.FT_Polluting;
 import com.hbm.inventory.fluid.trait.FluidTrait.FluidReleaseType;
 import com.hbm.inventory.gui.GUICombustionEngine;
 import com.hbm.items.ModItems;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java

@@ -14,7 +14,6 @@ import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
-import com.hbm.inventory.fluid.trait.FT_Polluting;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.inventory.fluid.trait.FluidTrait.FluidReleaseType;
 import com.hbm.inventory.gui.GUIMachineDiesel;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java

@@ -5,8 +5,6 @@ import java.util.List;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.MultiblockHandlerXR;
-import com.hbm.handler.pollution.PollutionHandler;
-import com.hbm.handler.pollution.PollutionHandler.PollutionType;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.UpgradeManager;

src/main/java/com/hbm/util/EntityDamageUtil.java

@@ -2,45 +2,18 @@ package com.hbm.util;
 
 import java.lang.reflect.Method;
 
-import com.hbm.handler.ArmorModHandler;
-import com.hbm.items.ModItems;
-
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.DamageSource;
-import net.minecraft.util.EntityDamageSource;
 import net.minecraftforge.common.ForgeHooks;
 
 public class EntityDamageUtil {
 	
-	public static boolean wasAttackedByV1(DamageSource source) {
-
-		if(source instanceof EntityDamageSource) {
-			Entity attacker = ((EntityDamageSource) source).getEntity();
-			
-			if(attacker instanceof EntityPlayer) {
-				EntityPlayer player = (EntityPlayer) attacker;
-				ItemStack chestplate = player.inventory.armorInventory[2];
-				
-				if(chestplate != null && ArmorModHandler.hasMods(chestplate)) {
-					ItemStack[] mods = ArmorModHandler.pryMods(chestplate);
-					
-					if(mods[ArmorModHandler.extra] != null && mods[ArmorModHandler.extra].getItem() == ModItems.v1) {
-						return true;
-					}
-				}
-			}
-		}
-		
-		return false;
-	}
-	
 	/**
 	 * Attacks the given entity twice, based on a piecring percentage. The second hit sets the damage source to bypass armor.
 	 * The damage source is modified, so you can't reuse damage source instances.

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -1355,6 +1355,7 @@ item.bottle_opener.name=Hbms eigener selbstgebauter Flaschenöffner
 item.bottle_quantum.name=Nuka Cola Quantum
 item.bottle_rad.name=S~Cola RAD
 item.bottle_sparkle.name=S~Cola
+item.bottled_cloud.name=Wolke in einer Flasche
 item.boy_bullet.name=U235 Geschoss
 item.boy_igniter.name=Zünder
 item.boy_kit.name=Little Boy Kit
@@ -3418,7 +3419,6 @@ item.upgrade_stack_1.name=Stapelupgrade Mk.I
 item.upgrade_stack_2.name=Stapelupgrade Mk.II
 item.upgrade_stack_3.name=Stapelupgrade Mk.III
 item.upgrade_template.name=Maschinenupgrade-Vorlage
-item.v1.name=V1
 item.volcanic_pickaxe.name=Geschmolzene Spitzhacke
 item.wand_d.name=Debug-Zauberstab
 item.wand_k.name=Konstruktions-Zauberstab

src/main/resources/assets/hbm/lang/en_US.lang

@@ -2070,6 +2070,7 @@ item.bottle_opener.name=Hbm's Own Self-Made Bottle Opener
 item.bottle_quantum.name=Bottle of Nuka Cola Quantum
 item.bottle_rad.name=Bottle of S~Cola RAD
 item.bottle_sparkle.name=Bottle of S~Cola
+item.bottled_cloud.name=Cloud in a Bottle
 item.boy_bullet.name=U235 Projectile
 item.boy_igniter.name=Bomb Igniter
 item.boy_kit.name=Little Boy Kit
@@ -4400,7 +4401,6 @@ item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I
 item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II
 item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III
 item.upgrade_template.name=Machine Upgrade Template
-item.v1.name=V1
 item.volcanic_axe.name=Molten Axe
 item.volcanic_pickaxe.name=Molten Pickaxe
 item.wand_d.name=Debug Wand

src/main/resources/assets/hbm/lang/ru_RU.lang

@@ -2892,7 +2892,6 @@ item.insert_doxium.name=Астольфий-легированная Доксие
 item.wd40.name=VT-40
 item.injector_5htp.name=Автоинъектор 5-гидрокситриптофана
 item.injector_knife.name=Автоинъектор 8 дюймового лезвия
-item.v1.name=V1
 item.holotape_image.name=Голодиск
 item.holotape_damaged.name=Повреждённый голодиск
 

src/main/resources/assets/hbm/lang/zh_CN.lang

@@ -4225,7 +4225,6 @@ item.upgrade_stack_1.name=一级堆栈弹出升级
 item.upgrade_stack_2.name=二级堆栈弹出升级
 item.upgrade_stack_3.name=三级堆栈弹出升级
 item.upgrade_template.name=机器升级模板
-item.v1.name=V1
 item.volcanic_pickaxe.name=熔岩镐
 item.wand_d.name=调试魔杖
 item.wand_k.name=建筑魔杖

src/main/resources/assets/hbm/sounds.json

@@ -261,8 +261,6 @@
     
     "player.vomit": {"category": "player", "sounds": [{"name": "player/vomit", "stream": false}]},
     "player.cough": {"category": "player", "sounds": ["player/cough1", "player/cough2", "player/cough3", "player/cough4"]},
-    "player.dash": {"category": "player", "sounds": [{"name": "player/dash", "stream": false}]},
-    "player.dashRecharge": {"category": "player", "sounds": [{"name": "player/dashRecharge", "stream": false}]},
     
     "potatos.random": {"category": "player", "sounds": ["potatos/randResponse0", "potatos/randResponse1", "potatos/randResponse2", "potatos/randResponse3", "potatos/randResponse4", "potatos/randResponse5", "potatos/randResponse6", "potatos/randResponse7"]},