Merge pull request #1845 from Agarmal/m1tty-nvg

Fix effect conflicts with Night Vision Goggles in the M1TTY Environment Suit

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

@@ -1,13 +1,12 @@
 package com.hbm.handler;
 
-import java.util.UUID;
-
 import com.hbm.items.armor.ItemArmorMod;
-
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import java.util.UUID;
+
 public class ArmorModHandler {
 
 	public static final int helmet_only = 0;
@@ -19,28 +18,28 @@ public class ArmorModHandler {
 	public static final int kevlar = 6;
 	public static final int extra = 7;
 	public static final int battery = 8;
-	
+
 	public static final int MOD_SLOTS = 9;
-	
+
 	public static final UUID[] UUIDs = new UUID[] {
 			UUID.fromString("8d6e5c77-133e-4056-9c80-a9e42a1a0b65"),
 			UUID.fromString("b1b7ee0e-1d14-4400-8037-f7f2e02f21ca"),
 			UUID.fromString("30b50d2a-4858-4e5b-88d4-3e3612224238"),
 			UUID.fromString("426ee0d0-7587-4697-aaef-4772ab202e78")
 	};
-	
+
 	public static final UUID[] fixedUUIDs = new UUID[] {
 			UUID.fromString("e572caf4-3e65-4152-bc79-c4d4048cbd29"),
 			UUID.fromString("bed30902-8a6a-4769-9f65-2a9b67469fff"),
 			UUID.fromString("baebf7b3-1eda-4a14-b233-068e2493e9a2"),
 			UUID.fromString("28016c1b-d992-4324-9409-a9f9f0ffb85c")
 	};
-	
+
 	//The key for the NBTTagCompound that holds the armor mods
 	public static final String MOD_COMPOUND_KEY = "ntm_armor_mods";
 	//The key for the specific slot inside the armor mod NBT Tag
 	public static final String MOD_SLOT_KEY = "mod_slot_";
-	
+
 	/**
 	 * Checks if a mod can be applied to an armor piece
 	 * Needs to be used to prevent people from inserting invalid items into the armor table
@@ -49,23 +48,23 @@ public class ArmorModHandler {
 	 * @return
 	 */
 	public static boolean isApplicable(ItemStack armor, ItemStack mod) {
-		
+
 		if(armor == null || mod == null)
 			return false;
-		
+
 		if(!(armor.getItem() instanceof ItemArmor))
 			return false;
-		
+
 		if(!(mod.getItem() instanceof ItemArmorMod))
 			return false;
-		
+
 		int type = ((ItemArmor)armor.getItem()).armorType;
-		
+
 		ItemArmorMod aMod = (ItemArmorMod)mod.getItem();
-		
+
 		return (type == 0 && aMod.helmet) || (type == 1 && aMod.chestplate) || (type == 2 && aMod.leggings) || (type == 3 && aMod.boots);
 	}
-	
+
 	/**
 	 * Applies an mod to the given armor piece
 	 * Make sure to check for applicability first
@@ -74,119 +73,124 @@ public class ArmorModHandler {
 	 * @param mod
 	 */
 	public static void applyMod(ItemStack armor, ItemStack mod) {
-		
+
 		if(!armor.hasTagCompound())
 			armor.stackTagCompound = new NBTTagCompound();
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
-		
+
 		if(!nbt.hasKey(MOD_COMPOUND_KEY))
 			nbt.setTag(MOD_COMPOUND_KEY, new NBTTagCompound());
-		
+
 		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
-		
+
 		ItemArmorMod aMod = (ItemArmorMod)mod.getItem();
 		int slot = aMod.type;
-		
+
 		NBTTagCompound cmp = new NBTTagCompound();
 		mod.writeToNBT(cmp);
-		
+
 		mods.setTag(MOD_SLOT_KEY + slot, cmp);
 	}
-	
+
 	/**
 	 * Removes the mod from the given slot
 	 * @param armor
 	 * @param slot
 	 */
 	public static void removeMod(ItemStack armor, int slot) {
-		
+
 		if(armor == null)
 			return;
-		
+
 		if(!armor.hasTagCompound())
 			armor.stackTagCompound = new NBTTagCompound();
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
-		
+
 		if(!nbt.hasKey(MOD_COMPOUND_KEY))
 			nbt.setTag(MOD_COMPOUND_KEY, new NBTTagCompound());
-		
+
 		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
 		mods.removeTag(MOD_SLOT_KEY + slot);
-		
+
 		if(mods.hasNoTags())
 			clearMods(armor);
 	}
-	
+
 	/**
 	 * Removes ALL mods
 	 * Should be used when the armor piece is put in the armor table slot AFTER the armor pieces have been separated
 	 * @param armor
 	 */
 	public static void clearMods(ItemStack armor) {
-		
+
 		if(!armor.hasTagCompound())
 			return;
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
 		nbt.removeTag(MOD_COMPOUND_KEY);
 	}
-	
+
 	/**
 	 * Does what the name implies. Returns true if the stack has NBT and that NBT has the MOD_COMPOUND_KEY tag.
 	 * @param armor
 	 * @return
 	 */
 	public static boolean hasMods(ItemStack armor) {
-		
+
 		if(!armor.hasTagCompound())
 			return false;
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
 		return nbt.hasKey(MOD_COMPOUND_KEY);
 	}
-	
+
+	/**
+	 * Gets all the modifications in the provided armor
+	 * @param armor
+	 * @return
+	 */
 	public static ItemStack[] pryMods(ItemStack armor) {
-		
+
 		ItemStack[] slots = new ItemStack[MOD_SLOTS];
 
 		if(!hasMods(armor))
 			return slots;
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
 		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
-		
+
 		for(int i = 0; i < MOD_SLOTS; i++) {
-			
+
 			NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + i);
-			
+
 			ItemStack stack = ItemStack.loadItemStackFromNBT(cmp);
-			
+
 			if(stack != null)
 				slots[i] = stack;
 			else // Any non-existing armor mods will be sorted out automatically
 				removeMod(armor, i);
 		}
-		
+
 		return slots;
 	}
-	
+
 	public static ItemStack pryMod(ItemStack armor, int slot) {
-		
+
 		if(!hasMods(armor))
 			return null;
-		
+
 		NBTTagCompound nbt = armor.getTagCompound();
 		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
 		NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + slot);
 		ItemStack stack = ItemStack.loadItemStackFromNBT(cmp);
-		
+
 		if(stack != null)
 			return stack;
-		
+
 		removeMod(armor, slot);
-		
+
 		return null;
 	}
 }

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

@@ -1,11 +1,9 @@
 package com.hbm.items.armor;
 
-import java.util.UUID;
-
 import com.google.common.collect.Multimap;
+import com.hbm.handler.ArmorModHandler;
 import com.hbm.items.ModItems;
 import com.hbm.render.model.ModelArmorEnvsuit;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBiped;
@@ -19,6 +17,8 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import java.util.UUID;
+
 public class ArmorEnvsuit extends ArmorFSBPowered {
 
 	public ArmorEnvsuit(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) {
@@ -41,14 +41,14 @@ public class ArmorEnvsuit extends ArmorFSBPowered {
 
 		return models[armorSlot];
 	}
-	
+
 	private static final UUID speed = UUID.fromString("6ab858ba-d712-485c-bae9-e5e765fc555a");
 
 	@Override
 	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
 
 		super.onArmorTick(world, player, stack);
-		
+
 		if(this != ModItems.envsuit_plate)
 			return;
 
@@ -56,13 +56,13 @@ public class ArmorEnvsuit extends ArmorFSBPowered {
 		Multimap multimap = super.getAttributeModifiers(stack);
 		multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(speed, "SQUIRREL SPEED", 0.1, 0));
 		player.getAttributeMap().removeAttributeModifiers(multimap);
-		
+
 		if(this.hasFSBArmor(player)) {
-			
+
 			if(player.isSprinting()) player.getAttributeMap().applyAttributeModifiers(multimap);
-			
+
 			if(player.isInWater()) {
-				
+
 				if(!world.isRemote) {
 					player.setAir(300);
 					player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0));
@@ -78,7 +78,14 @@ public class ArmorEnvsuit extends ArmorFSBPowered {
 				player.motionY += vec.yCoord;
 				player.motionZ += vec.zCoord;
 			} else {
-				if(!world.isRemote) {
+				boolean canRemoveNightVision = true;
+				ItemStack helmet = player.inventory.armorInventory[3];
+				ItemStack helmetMod = ArmorModHandler.pryMod(helmet, ArmorModHandler.helmet_only); // Get the modification!
+				if (helmetMod != null && helmetMod.getItem() instanceof ItemModNightVision) {
+					canRemoveNightVision = false;
+				}
+
+				if(!world.isRemote && canRemoveNightVision) {
 					player.removePotionEffect(Potion.nightVision.id);
 				}
 			}