From c0dd864e03f408b508f2e4e669e9228c3c291e8c Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Mon, 19 Oct 2020 22:47:44 +0200
Subject: [PATCH] small FSB armor adjustments

---
 src/main/java/assets/hbm/sounds.json          |   2 +
 .../assets/hbm/sounds/footsteps/metal.ogg     | Bin 0 -> 5022 bytes
 src/main/java/com/hbm/items/ModItems.java     |   7 +-
 .../java/com/hbm/items/armor/ArmorFSB.java    |  71 +++++++++++++++++-
 .../com/hbm/items/special/ItemStarterKit.java |   2 +-
 .../java/com/hbm/main/ModEventHandler.java    |  17 +++++
 .../com/hbm/main/ModEventHandlerClient.java   |  17 ++++-
 7 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/assets/hbm/sounds/footsteps/metal.ogg

diff --git a/src/main/java/assets/hbm/sounds.json b/src/main/java/assets/hbm/sounds.json
index f3c4e7390..f3f0309a6 100644
--- a/src/main/java/assets/hbm/sounds.json
+++ b/src/main/java/assets/hbm/sounds.json
@@ -160,6 +160,8 @@
     "entity.ducc": {"category": "neutral", "sounds": ["entity/ducc1", "entity/ducc2"]},
     "entity.slicer": {"category": "neutral", "sounds": ["entity/slicer1", "entity/slicer2", "entity/slicer3", "entity/slicer4"]},
     
+    "step.metal": {"category": "player", "sounds": [{"name": "footsteps/metal", "stream": false}]},
+    
     "potatos.random": {"category": "player", "sounds": ["potatos/randResponse0", "potatos/randResponse1", "potatos/randResponse2", "potatos/randResponse3", "potatos/randResponse4", "potatos/randResponse5", "potatos/randResponse6", "potatos/randResponse7"]},
     
     "fm.clap":  {"category": "block", "sounds": [{"name": "clap", "stream": false}]},
diff --git a/src/main/java/assets/hbm/sounds/footsteps/metal.ogg b/src/main/java/assets/hbm/sounds/footsteps/metal.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..f105a7a9115dc5012818388169a14bb62ddec595
GIT binary patch
literal 5022
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

literal 0
HcmV?d00001

diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java
index 1b1720730..d0f5481d7 100644
--- a/src/main/java/com/hbm/items/ModItems.java
+++ b/src/main/java/com/hbm/items/ModItems.java
@@ -3613,7 +3613,12 @@ public class ModItems {
 		starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots");
 		
 		bj_helmet = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).setMod(0.5F).setCap(15F)
-				.setFireproof(true).setUnlocalizedName("bj_helmet").setTextureName(RefStrings.MODID + ":bj_helmet");
+				.setFireproof(true)
+				.enableThermalSight(true)
+				.addEffect(new PotionEffect(Potion.jump.id, 20, 0))
+				.setGravity(0.02D)
+				.setStep("hbm:step.metal")
+				.addResistance("fall", 0).setUnlocalizedName("bj_helmet").setTextureName(RefStrings.MODID + ":bj_helmet");
 		bj_plate = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate");
 		bj_legs = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs");
 		bj_boots = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots");
diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java
index 8ee22b949..49fd13b10 100644
--- a/src/main/java/com/hbm/items/armor/ArmorFSB.java
+++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java
@@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.interfaces.Untested;
 
+import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
@@ -25,8 +26,11 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.sound.PlaySoundEvent17;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
+import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
+import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent;
 
 //Armor with full set bonus
 public class ArmorFSB extends ItemArmor {
@@ -40,6 +44,9 @@ public class ArmorFSB extends ItemArmor {
 	public float damageMod = -1;
 	public boolean fireproof = false;
 	public boolean noHelmet = false;
+	public boolean thermal = false;
+	public double gravity = 0;
+	public String step;
 
 	public ArmorFSB(ArmorMaterial material, int layer, int slot, String texture) {
 		super(material, layer, slot);
@@ -76,6 +83,21 @@ public class ArmorFSB extends ItemArmor {
 		return this;
 	}
 	
+	public ArmorFSB enableThermalSight(boolean thermal) {
+		this.thermal = thermal;
+		return this;
+	}
+	
+	public ArmorFSB setGravity(double gravity) {
+		this.gravity = gravity;
+		return this;
+	}
+	
+	public ArmorFSB setStep(String step) {
+		this.step = step;
+		return this;
+	}
+	
 	public ArmorFSB setOverlay(String path) {
 		this.overlay = new ResourceLocation(path);
 		return this;
@@ -90,6 +112,9 @@ public class ArmorFSB extends ItemArmor {
 		this.damageMod = original.damageMod;
 		this.fireproof = original.fireproof;
 		this.noHelmet = original.noHelmet;
+		this.thermal = original.thermal;
+		this.gravity = original.gravity;
+		this.step = original.step;
 		//overlay doesn't need to be copied because it's helmet exclusive
 		return this;
 	}
@@ -134,6 +159,10 @@ public class ArmorFSB extends ItemArmor {
     	if(fireproof) {
 			list.add("  Fireproof");
     	}
+    	
+    	if(thermal) {
+			list.add("  Thermal Sight");
+    	}
     }
     
     public static boolean hasFSBArmor(EntityPlayer player) {
@@ -180,6 +209,11 @@ public class ArmorFSB extends ItemArmor {
 					player.extinguish();
 					event.setCanceled(true);
 				}
+				
+				if(chestplate.resistance.get(event.source.getDamageType()) != null &&
+						chestplate.resistance.get(event.source.getDamageType()) <= 0) {
+					event.setCanceled(true);
+				}
 			}
 		}
     }
@@ -201,7 +235,7 @@ public class ArmorFSB extends ItemArmor {
 				}
 				
 				if(chestplate.resistance.get(event.source.getDamageType()) != null) {
-					event.ammount *= chestplate.resistance.get(event.source);
+					event.ammount *= chestplate.resistance.get(event.source.getDamageType());
 				}
 				
 				if(chestplate.blastProtection != -1 && event.source.isExplosion()) {
@@ -214,6 +248,41 @@ public class ArmorFSB extends ItemArmor {
 			}
 		}
     }
+
+	@Untested
+    public static void handleTick(TickEvent.PlayerTickEvent event) {
+		
+		EntityPlayer player = event.player;
+
+		if(ArmorFSB.hasFSBArmor(player)) {
+
+			ItemStack plate = player.inventory.armorInventory[2];
+
+			ArmorFSB chestplate = (ArmorFSB) plate.getItem();
+
+			if(!chestplate.effects.isEmpty()) {
+
+				for(PotionEffect i : chestplate.effects) {
+					player.addPotionEffect(new PotionEffect(i.getPotionID(), i.getDuration(), i.getAmplifier(), i.getIsAmbient()));
+				}
+			}
+			
+			if(!player.capabilities.isFlying && !player.isInWater())
+				player.motionY -= chestplate.gravity;
+		}
+    }
+	
+	@Untested
+	public static void handleFall(EntityPlayer player) {
+
+		if(ArmorFSB.hasFSBArmor(player)) {
+
+			ArmorFSB chestplate = (ArmorFSB) player.inventory.armorInventory[3].getItem();
+
+			if(chestplate.step != null)
+				player.playSound(chestplate.step, 1.0F, 1.0F);
+		}
+	}
 	
     @SideOnly(Side.CLIENT)
     public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){
diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java
index f938f762e..8ea7bfce4 100644
--- a/src/main/java/com/hbm/items/special/ItemStarterKit.java
+++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java
@@ -571,7 +571,7 @@ public class ItemStarterKit extends Item {
 		
 		if(this == ModItems.stealth_boy)
 		{
-			player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 30 * 20, 0, true));
+			player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 30 * 20, 1, true));
 		}
 		
 		if(this == ModItems.euphemium_kit)
diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java
index 4e3bfadf9..f09b96d17 100644
--- a/src/main/java/com/hbm/main/ModEventHandler.java
+++ b/src/main/java/com/hbm/main/ModEventHandler.java
@@ -67,8 +67,10 @@ import net.minecraftforge.event.ServerChatEvent;
 import net.minecraftforge.event.entity.EntityEvent.EnteringChunk;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
+import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.living.LivingSpawnEvent;
+import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
 
@@ -402,11 +404,26 @@ public class ModEventHandler
 		ArmorFSB.handleHurt(event);
 	}
 	
+	@SubscribeEvent
+	public void onPlayerFall(PlayerFlyableFallEvent event) {
+		
+		ArmorFSB.handleFall(event.entityPlayer);
+	}
+	
+	@SubscribeEvent
+	public void onEntityFall(LivingFallEvent event) {
+		
+		if(event.entityLiving instanceof EntityPlayer)
+			ArmorFSB.handleFall((EntityPlayer) event.entityLiving);
+	}
+	
 	@SubscribeEvent
 	public void onPlayerTick(TickEvent.PlayerTickEvent event) {
 		
 		EntityPlayer player = event.player;
 		
+		ArmorFSB.handleTick(event);
+		
 		if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) {
 			
 			/// GHOST FIX START ///
diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java
index 0360bc521..d75a1bf2a 100644
--- a/src/main/java/com/hbm/main/ModEventHandlerClient.java
+++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java
@@ -16,6 +16,7 @@ import com.hbm.interfaces.IHoldableWeapon;
 import com.hbm.interfaces.Spaghetti;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.armor.ArmorFSB;
 import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.lib.Library;
 import com.hbm.lib.RefStrings;
@@ -50,6 +51,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.boss.IBossDisplayData;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityXPOrb;
@@ -57,6 +59,8 @@ import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
@@ -162,6 +166,11 @@ public class ModEventHandlerClient {
 		RenderPlayer renderer = event.renderer;
 		AbstractClientPlayer player = (AbstractClientPlayer)event.entityPlayer;
 		
+		PotionEffect invis = player.getActivePotionEffect(Potion.invisibility);
+		
+		if(invis != null && invis.getAmplifier() > 0)
+			event.setCanceled(true);
+		
 		ResourceLocation cloak = RenderAccessoryUtility.getCloakFromPlayer(player);
 		
 		if(cloak != null)
@@ -380,7 +389,13 @@ public class ModEventHandlerClient {
 		
 		GL11.glPopMatrix();
 		
-		renderThermalSight(event.partialTicks);
+		if(ArmorFSB.hasFSBArmor(player)) {
+			ItemStack plate = player.inventory.armorInventory[2];
+			ArmorFSB chestplate = (ArmorFSB)plate.getItem();
+			
+			if(chestplate.thermal)
+				renderThermalSight(event.partialTicks);
+		}
 	}
 	
 	public void renderThermalSight(float partialTicks) {