From 0b7c14cb7911694bebc1bf8898749257d702ffaf Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Tue, 13 Feb 2018 21:46:53 +0100
Subject: [PATCH] More jetpacks

---
 assets/hbm/lang/de_DE.lang                    |   5 ++
 assets/hbm/lang/en_US.lang                    |   5 ++
 assets/hbm/textures/items/jetpack_vector.png  | Bin 0 -> 232 bytes
 .../{jetpack_hover.png => jetpack_winged.png} | Bin
 assets/hbm/textures/models/JetPackGreen.png   | Bin 0 -> 608 bytes
 .../entity/logic/EntityNukeExplosionMK4.java  |   4 +-
 com/hbm/items/ModItems.java                   |   6 ++
 com/hbm/items/gear/JetpackBreak.java          |  68 ++++++++++++++++
 com/hbm/items/gear/JetpackRegular.java        |   4 +-
 com/hbm/items/gear/JetpackVectorized.java     |  73 ++++++++++++++++++
 com/hbm/main/CraftingManager.java             |   5 ++
 11 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 assets/hbm/textures/items/jetpack_vector.png
 rename assets/hbm/textures/items/{jetpack_hover.png => jetpack_winged.png} (100%)
 create mode 100644 assets/hbm/textures/models/JetPackGreen.png
 create mode 100644 com/hbm/items/gear/JetpackBreak.java
 create mode 100644 com/hbm/items/gear/JetpackVectorized.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 9242e044c..0d61b440b 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -1146,6 +1146,11 @@ item.schrabidium_axe.name=Schrabidiumaxt
 item.schrabidium_shovel.name=Schrabidiumschaufel
 item.schrabidium_hoe.name=Schrabidiumfeldhacke
 
+item.jetpack_boost.name=Boosterrucksack
+item.jetpack_fly.name=Raketenrucksack
+item.jetpack_break.name=Bremsrucksack
+item.jetpack_vector.name=Schubvektorgesteuerter Raketenrucksack
+
 item.chainsaw.name=Kettensäge
 item.crowbar.name=Mk.V Kistenöffnungsapparat "Brechstange"
 
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index d3d717f4f..4de812045 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -1149,6 +1149,11 @@ item.schrabidium_axe.name=Schrabidium Axe
 item.schrabidium_shovel.name=Schrabidium Shovel
 item.schrabidium_hoe.name=Schrabidium Hoe
 
+item.jetpack_boost.name=Boostpack
+item.jetpack_fly.name=Jetpack
+item.jetpack_break.name=Breakpack
+item.jetpack_vector.name=Vectored Jetpack
+
 item.chainsaw.name=Chainsaw
 item.crowbar.name=Mk.V Crate Opening Device "Crowbar"
 
diff --git a/assets/hbm/textures/items/jetpack_vector.png b/assets/hbm/textures/items/jetpack_vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..004de58e49d68771f47784160855638a0f6e77ae
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<j?nXaSXBO
zO-_)Qa^R)n;rgT_5+JZq^Up_-Lw0Gb6OXI0G3&fw+puh>vB95zXFvS@p3lbCcG%)*
zM^R(kQcY$cIK0+%x#Wo=M(f-8O?n3m7$gfeZFG|OU$8pyP&$KQLlX0cs)xVV-)9MZ
zX!_v!{QXO$KS)d6+F$=aZARfE6BR{E%fJ75`&pUT?(8b<et3O-yhhi?&Vvj`8$Ape
Z7%sHMOiMPG3j{iq!PC{xWt~$(696PRSDgR=

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/jetpack_hover.png b/assets/hbm/textures/items/jetpack_winged.png
similarity index 100%
rename from assets/hbm/textures/items/jetpack_hover.png
rename to assets/hbm/textures/items/jetpack_winged.png
diff --git a/assets/hbm/textures/models/JetPackGreen.png b/assets/hbm/textures/models/JetPackGreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d5bd69b59b5a50e3b12d2aedb83633a6e9d31df
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS0006PNkl<ZScUDDy^hmB6orq;TnC)pRq_In+(4g#W}B7kc>=nvc?Gtk;02Jj
z+m~=ffrJnh5?vZMR#G65bXj7Nxw9Gy$CmAQy)$4I@$*TM$IkW4ojGUj*h2*=rSW|q
zN+|$9(T?NTLknRT8X^KSW4qmgnL$KYtyZn^Z9J&nFmrjWwr_)(ktB)7%*e8={J9{S
z9j@1F5D@^>+HEMMFquq@QmTyWif_Y{Qkv$BtDP0?LXP=-4rVT8s>b`iUwfCCk)~;<
z93p!iLvH|m4Lp1iVR!K!H%IxO`WWDoedH9#mH^H|ry1Ub^9ocA*}Dl{>D`2`^kG8h
z1i~;hRTCBv5k{jChzR5H*jSse(BF37_l;;<vfE4u0BM?f=chB%)#=rTPu3=^1=^J2
z^V6BxX<h4NC<KOLP<wXy?xR%_KU|9QK}F-);2@E^a4yBg0L3a4vmc599{FxN002a@
z5LF3+07O)m=K72CAe{+ROECcGuK>M@@a^T>)>6ECHp5Qqa`~Hn$e-QVClEZBhniD<
zE*$Ivr2u^HW#BRa*B4y2m<>O57W@?n{CTC=hNo{}#1SBl0dWEZQy})x?VV@=BMmxh
z{I8(&fZpssx$YS+TEOT{ek1lpCz$5fYzd@iVX1xdqr>LBw?-P6Xz?2*$d<Vb_l+kF
uOrd?76v>mv2V1l%MUo`FR>uGQdwd5&_;Z)_HXh*s0000<MNUMnLSTa2>J@<i

literal 0
HcmV?d00001

diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK4.java b/com/hbm/entity/logic/EntityNukeExplosionMK4.java
index fae26d829..2b82c85ce 100644
--- a/com/hbm/entity/logic/EntityNukeExplosionMK4.java
+++ b/com/hbm/entity/logic/EntityNukeExplosionMK4.java
@@ -45,11 +45,11 @@ public class EntityNukeExplosionMK4 extends Entity {
 		
 		if(explosion.getStoredSize() < count / length) {
 			//if(!worldObj.isRemote)
-			MainRegistry.logger.info(explosion.getStoredSize() + " / " + count / length);
+			//MainRegistry.logger.info(explosion.getStoredSize() + " / " + count / length);
 				explosion.collectTip(speed * 10);
 		} else if(explosion.getProgress() < count / length) {
 			//if(!worldObj.isRemote)
-			MainRegistry.logger.info(explosion.getProgress() + " / " + count / length);
+			//MainRegistry.logger.info(explosion.getProgress() + " / " + count / length);
 				explosion.processTip(speed);
 		} else {
 			this.setDead();
diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java
index 412e38c59..99db459c9 100644
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@@ -913,7 +913,9 @@ public class ModItems {
 	public static Item australium_v;
 
 	public static Item jetpack_boost;
+	public static Item jetpack_break;
 	public static Item jetpack_fly;
+	public static Item jetpack_vector;
 
 	public static Item schrabidium_sword;
 	public static Item schrabidium_pickaxe;
@@ -2131,7 +2133,9 @@ public class ModItems {
 		australium_v = new ArmorAustralium(MainRegistry.enumArmorMaterialAusV, 9, 1).setUnlocalizedName("australium_v").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_v");
 		
 		jetpack_boost = new JetpackBooster(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_boost").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
+		jetpack_break = new JetpackBreak(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_break").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
 		jetpack_fly = new JetpackRegular(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_fly").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
+		jetpack_vector = new JetpackVectorized(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_vector").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector");
 
 		cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test");
 		cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
@@ -3342,7 +3346,9 @@ public class ModItems {
 		GameRegistry.registerItem(mask_of_infamy, mask_of_infamy.getUnlocalizedName());
 		GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName());
 		GameRegistry.registerItem(jetpack_boost, jetpack_boost.getUnlocalizedName());
+		GameRegistry.registerItem(jetpack_break, jetpack_break.getUnlocalizedName());
 		GameRegistry.registerItem(jetpack_fly, jetpack_fly.getUnlocalizedName());
+		GameRegistry.registerItem(jetpack_vector, jetpack_vector.getUnlocalizedName());
 		//GameRegistry.registerItem(australium_iv, australium_iv.getUnlocalizedName());
 		//GameRegistry.registerItem(australium_v, australium_v.getUnlocalizedName());
 		
diff --git a/com/hbm/items/gear/JetpackBreak.java b/com/hbm/items/gear/JetpackBreak.java
new file mode 100644
index 000000000..4b0283591
--- /dev/null
+++ b/com/hbm/items/gear/JetpackBreak.java
@@ -0,0 +1,68 @@
+package com.hbm.items.gear;
+
+import com.hbm.entity.particle.EntityGasFlameFX;
+import com.hbm.render.model.ModelJetPack;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class JetpackBreak extends ItemArmor {
+
+	private ModelJetPack model;
+
+	public JetpackBreak(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) {
+		super(p_i45325_1_, p_i45325_2_, p_i45325_3_);
+	}
+
+
+	@Override
+	public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) {
+		return armorType == 1;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+		if (armorSlot == 1) {
+			if (model == null) {
+				this.model = new ModelJetPack();
+			}
+			return this.model;
+		}
+		
+		return null;
+	}
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		return "hbm:textures/models/JetPackBlue.png";
+	}
+
+	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
+    	
+    	if(player.motionY < -0.25) {
+    		
+    		Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord);
+    		vec.normalize();
+    		player.motionY = -0.25;
+    		
+    		EntityGasFlameFX fx = new EntityGasFlameFX(world);
+    		fx.posX = player.posX - vec.xCoord;
+    		fx.posY = player.posY - 1;
+    		fx.posZ = player.posZ - vec.zCoord;
+    		fx.motionY = -0.5;
+    		world.spawnEntityInWorld(fx);
+    		
+    		player.fallDistance = 0;
+    	}
+    }
+}
diff --git a/com/hbm/items/gear/JetpackRegular.java b/com/hbm/items/gear/JetpackRegular.java
index 5156529fe..e69032984 100644
--- a/com/hbm/items/gear/JetpackRegular.java
+++ b/com/hbm/items/gear/JetpackRegular.java
@@ -56,13 +56,13 @@ public class JetpackRegular extends ItemArmor {
     		
     		Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord);
     		vec.normalize();
-    		player.motionY += 0.1;
+    		player.motionY += 0.15;
     		
     		EntityGasFlameFX fx = new EntityGasFlameFX(world);
     		fx.posX = player.posX - vec.xCoord;
     		fx.posY = player.posY - 1;
     		fx.posZ = player.posZ - vec.zCoord;
-    		fx.motionY = -0.1;
+    		fx.motionY = -0.15;
     		world.spawnEntityInWorld(fx);
     		
     		player.fallDistance = 0;
diff --git a/com/hbm/items/gear/JetpackVectorized.java b/com/hbm/items/gear/JetpackVectorized.java
new file mode 100644
index 000000000..52d6484b0
--- /dev/null
+++ b/com/hbm/items/gear/JetpackVectorized.java
@@ -0,0 +1,73 @@
+package com.hbm.items.gear;
+
+import com.hbm.entity.particle.EntityGasFlameFX;
+import com.hbm.render.model.ModelJetPack;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class JetpackVectorized extends ItemArmor {
+
+	private ModelJetPack model;
+
+	public JetpackVectorized(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) {
+		super(p_i45325_1_, p_i45325_2_, p_i45325_3_);
+	}
+
+
+	@Override
+	public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) {
+		return armorType == 1;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+		if (armorSlot == 1) {
+			if (model == null) {
+				this.model = new ModelJetPack();
+			}
+			return this.model;
+		}
+		
+		return null;
+	}
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		return "hbm:textures/models/JetPackGreen.png";
+	}
+
+	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
+    	
+    	if(player.isSneaking()) {
+    		
+    		Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord);
+    		vec.normalize();
+
+    		player.motionX += vec.xCoord * 0.2;
+    		player.motionY += 0.15;
+    		player.motionZ += vec.zCoord * 0.2;
+    		
+    		EntityGasFlameFX fx = new EntityGasFlameFX(world);
+    		fx.posX = player.posX - vec.xCoord;
+    		fx.posY = player.posY - 1;
+    		fx.posZ = player.posZ - vec.zCoord;
+    		fx.motionX -= vec.xCoord * 0.2;
+    		fx.motionY -= vec.yCoord * 0.2;
+    		fx.motionZ -= vec.zCoord * 0.2;
+    		world.spawnEntityInWorld(fx);
+    		
+    		player.fallDistance = 0;
+    	}
+    }
+}
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index 1de315af8..ef1fff364 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -942,6 +942,11 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.desh_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_desh, 'S', Items.stick });
 		GameRegistry.addRecipe(new ItemStack(ModItems.desh_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_desh, 'S', Items.stick });
 
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_boost, 1), new Object[] { "PTP", "SLS", "W W", 'P', "plateSteel", 'T', ModItems.tank_steel, 'S', ModItems.pipes_steel, 'L', Items.leather, 'W', ModItems.thruster_small }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_fly, 1), new Object[] { "PTP", "SLS", "W W", 'P', "plateSteel", 'T', ModItems.cap_aluminium, 'S', ModItems.pipes_steel, 'L', ModItems.jetpack_boost, 'W', ModItems.thruster_small }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_break, 1), new Object[] { "PTP", "SLS", "P P", 'P', "plateSteel", 'T', ModItems.cap_aluminium, 'S', ModItems.coil_tungsten, 'L', ModItems.jetpack_boost }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_vector, 1), new Object[] { "PTP", "SLS", "W W", 'P', "plateTitanium", 'T', ModItems.circuit_copper, 'S', ModItems.motor, 'L', ModItems.jetpack_fly, 'W', ModItems.thruster_small }));
+
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chainsaw, 1), new Object[] { "TTG", "SSM", 'T', "plateIron", 'S', "plateSteel", 'M', ModItems.motor, 'G', ModItems.circuit_gold }));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wiring_red_copper, 1), new Object[] { "PPP", "PIP", "PPP", 'P', "plateSteel", 'I', "ingotSteel" }));