Merge branch 'DeltaHelios-master'

projects/pswg/src/main/java/com/parzivail/pswg/Client.java

@@ -670,8 +670,35 @@ private static void registerArmor()
 				ArmorRenderer.Metadata.HIDE_CHEST_HIDE_HAIR
 		);
 		ArmorRenderer.register(
-				SwgItems.Armor.TieCadetHelmet,
-				Resources.id("tie_cadet"),
+				SwgItems.Armor.ImperialPilotCadetHelmet,
+				Resources.id("imperial_pilot_cadet"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/tie_cadet"),
+						Resources.id("textures/armor/tie_cadet.png")
+				),
+				ArmorRenderer.Metadata.KEEP_CHEST_HIDE_HAIR
+		);
+		ArmorRenderer.register(
+				SwgItems.Armor.ImperialPilotTechnicalHelmet,
+				Resources.id("imperial_pilot_technical_helmet"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/tie_technical_helmet"),
+						Resources.id("textures/armor/tie_technical_helmet.png")
+				),
+				ArmorRenderer.Metadata.KEEP_CHEST_HIDE_HAIR
+		);
+		ArmorRenderer.register(
+				SwgItems.Armor.ImperialPilotColdHelmet,
+				Resources.id("imperial_pilot_cold_helmet"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/tie_cold_helmet"),
+						Resources.id("textures/armor/tie_cold_helmet.png")
+				),
+				ArmorRenderer.Metadata.KEEP_CHEST_HIDE_HAIR
+		);
+		ArmorRenderer.register(
+				SwgItems.Armor.ImperialPilotCadetHelmet,
+				Resources.id("imperial_pilot_cadet"),
 				new ArmorRenderer.Assets(
 						Resources.id("armor/tie_cadet"),
 						Resources.id("textures/armor/tie_cadet.png")
@@ -795,6 +822,54 @@ private static void registerArmor()
 				),
 				ArmorRenderer.Metadata.NO_CHANGE
 		);
+		ArmorRenderer.registerAccessory(
+				SwgItems.Armor.CJ33Jetpack,
+				entity -> TrinketUtil.getEquipped(entity, SwgItems.Armor.CJ33Jetpack),
+				Resources.id("cj33_jetpack"),
+				EquipmentSlot.CHEST,
+				model -> model.body.getChild("jetpack"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/cj33_jetpack"),
+						Resources.id("textures/armor/cj33_jetpack.png")
+				),
+				ArmorRenderer.Metadata.NO_CHANGE
+		);
+		ArmorRenderer.registerAccessory(
+				SwgItems.Armor.JT12Jetpack,
+				entity -> TrinketUtil.getEquipped(entity, SwgItems.Armor.JT12Jetpack),
+				Resources.id("jt12_jetpack"),
+				EquipmentSlot.CHEST,
+				model -> model.body.getChild("jetpack"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/jt12_jetpack"),
+						Resources.id("textures/armor/jt12_jetpack.png")
+				),
+				ArmorRenderer.Metadata.NO_CHANGE
+		);
+		ArmorRenderer.registerAccessory(
+				SwgItems.Armor.Z6Jetpack,
+				entity -> TrinketUtil.getEquipped(entity, SwgItems.Armor.Z6Jetpack),
+				Resources.id("z6_jetpack"),
+				EquipmentSlot.CHEST,
+				model -> model.body.getChild("jetpack"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/z6_jetpack"),
+						Resources.id("textures/armor/z6_jetpack.png")
+				),
+				ArmorRenderer.Metadata.NO_CHANGE
+		);
+		ArmorRenderer.registerAccessory(
+				SwgItems.Armor.RebelJumpPack,
+				entity -> TrinketUtil.getEquipped(entity, SwgItems.Armor.RebelJumpPack),
+				Resources.id("rebel_jump_pack"),
+				EquipmentSlot.CHEST,
+				model -> model.body.getChild("jetpack"),
+				new ArmorRenderer.Assets(
+						Resources.id("armor/rebel_jump_pack"),
+						Resources.id("textures/armor/rebel_jump_pack.png")
+				),
+				ArmorRenderer.Metadata.NO_CHANGE
+		);
 	}
 
 	private static void registerBlockData(ClientBlockRegistryData data, Block block)

projects/pswg/src/main/java/com/parzivail/pswg/container/SwgItems.java

@@ -93,9 +93,15 @@ public static class Armor
 		@RegistryName("imperial_pilot_kit")
 		@TarkinItem
 		public static final ArmorItem ImperialPilotKit = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.CHESTPLATE, new Item.Settings().maxCount(1));
-		@RegistryName("tie_cadet")
+		@RegistryName("imperial_pilot_cadet")
 		@TarkinItem
-		public static final ArmorItem TieCadetHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1));
+		public static final ArmorItem ImperialPilotCadetHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1));
+		@RegistryName("imperial_pilot_technical_helmet")
+		@TarkinItem
+		public static final ArmorItem ImperialPilotTechnicalHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1));
+		@RegistryName("imperial_pilot_cold_helmet")
+		@TarkinItem
+		public static final ArmorItem ImperialPilotColdHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1));
 		@RegistryName("rebel_pilot_helmet")
 		@TarkinItem
 		public static final ArmorItem RebelPilotHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1));
@@ -159,6 +165,18 @@ public static class Armor
 		@RegistryName("tan_heavy_backpack")
 		@TarkinItem(tags = { TrItemTag.TrinketsChestBack })
 		public static final TrinketItem TanHeavyBackpack = new TrinketItem(new Item.Settings().maxCount(1));
+		@RegistryName("cj33_jetpack")
+		@TarkinItem(tags = { TrItemTag.TrinketsChestBack })
+		public static final TrinketItem CJ33Jetpack = new JetpackItem(new Item.Settings().maxCount(1), new JetpackItem.Stats());
+		@RegistryName("jt12_jetpack")
+		@TarkinItem(tags = { TrItemTag.TrinketsChestBack })
+		public static final TrinketItem JT12Jetpack = new JetpackItem(new Item.Settings().maxCount(1), new JetpackItem.Stats());
+		@RegistryName("z6_jetpack")
+		@TarkinItem(tags = { TrItemTag.TrinketsChestBack })
+		public static final TrinketItem Z6Jetpack = new JetpackItem(new Item.Settings().maxCount(1), new JetpackItem.Stats());
+		@RegistryName("rebel_jump_pack")
+		@TarkinItem(tags = { TrItemTag.TrinketsChestBack })
+		public static final TrinketItem RebelJumpPack = new JetpackItem(new Item.Settings().maxCount(1), new JetpackItem.Stats());
 	}
 
 	@RegistryOrder(2)

projects/pswg/src/main/resources/assets/pswg/lang/en_us.json

@@ -715,6 +715,8 @@
 	"item.pswg.thorilide_crystal": "Thorilide Crystal",
 	"item.pswg.thorilide_dust": "Thorilide Dust",
 	"item.pswg.tie_cadet": "Tie Cadet Helmet",
+	"item.pswg.tie_technical_helmet": "Tie Technical Helmet",
+	"item.pswg.tie_cold_helmet": "Tie Cold Helmet",
 	"item.pswg.titanium_axe": "Titanium Axe",
 	"item.pswg.titanium_hoe": "Titanium Hoe",
 	"item.pswg.titanium_ingot": "Titanium Ingot",

projects/pswg/src/main/resources/assets/pswg/models/item/cj33_jetpack.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/cj33_jetpack"}}

projects/pswg/src/main/resources/assets/pswg/models/item/jt12_jetpack.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/jt12_jetpack"}}

projects/pswg/src/main/resources/assets/pswg/models/item/rebel_jump_pack.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/rebel_jump_pack"}}

projects/pswg/src/main/resources/assets/pswg/models/item/tie_cold_helmet.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/tie_cold_helmet"}}

projects/pswg/src/main/resources/assets/pswg/models/item/tie_technical_helmet.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/tie_technical_helmet"}}

projects/pswg/src/main/resources/assets/pswg/models/item/z6_jetpack.json

@@ -0,0 +1 @@
+{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/z6_jetpack"}}

projects/pswg/src/main/resources/data/trinkets/tags/items/chest/back.json

@@ -1 +1 @@
-{"values":["pswg:artillerytrooper_backpack","pswg:brown_specialist_backpack","pswg:green_heavy_backpack","pswg:green_light_backpack","pswg:green_specialist_backpack","pswg:incineratortrooper_tank","pswg:jumptrooper_jetpack","pswg:sandtrooper_backpack","pswg:tan_heavy_backpack","pswg:tan_light_backpack","pswg:white_heavy_backpack","pswg:white_light_backpack"]}
+{"values":["pswg:artillerytrooper_backpack","pswg:brown_specialist_backpack","pswg:green_heavy_backpack","pswg:green_light_backpack","pswg:green_specialist_backpack","pswg:incineratortrooper_tank","pswg:jumptrooper_jetpack","pswg:sandtrooper_backpack","pswg:tan_heavy_backpack","pswg:tan_light_backpack","pswg:white_heavy_backpack","pswg:white_light_backpack","pswg:cj32_jetpack","pswg:cj33_jetpack","pswg:jt12_jetpack","pswg:z6_jetpack","pswg:rebel_jump_pack"]}

resources/models/armor & clothing/armor/Empire/technical_helmet.nemi

@@ -0,0 +1 @@
+{"exporter":"Blockbench 4.8.3","name":"","tex":{"w":64,"h":64},"parts":{"head":{"rot":{"pitch":0,"yaw":0,"roll":0},"boxes":[{"tex":{"u":0,"v":16},"pos":{"x":-4,"y":-8.25,"z":-4},"size":{"x":8,"y":8,"z":8},"inflate":0.3,"mirrored":false},{"tex":{"u":0,"v":0},"pos":{"x":-4,"y":-8.25,"z":-4},"size":{"x":8,"y":8,"z":8},"inflate":0.5,"mirrored":false},{"tex":{"u":23,"v":37},"pos":{"x":4,"y":-7.75,"z":-2.125},"size":{"x":1,"y":5,"z":5},"inflate":0.2,"mirrored":false},{"tex":{"u":12,"v":32},"pos":{"x":4,"y":-7.75,"z":-2.125},"size":{"x":1,"y":5,"z":5},"inflate":0.4,"mirrored":false},{"tex":{"u":12,"v":32},"pos":{"x":-5,"y":-7.75,"z":-2.125},"size":{"x":1,"y":5,"z":5},"inflate":0.4,"mirrored":true},{"tex":{"u":23,"v":37},"pos":{"x":-5,"y":-7.75,"z":-2.125},"size":{"x":1,"y":5,"z":5},"inflate":0.2,"mirrored":true},{"tex":{"u":24,"v":0},"pos":{"x":-4.997885430354371,"y":-1.780102612432632,"z":-1.2437081815793525},"size":{"x":10,"y":1,"z":6},"inflate":0.31,"mirrored":false},{"tex":{"u":0,"v":41},"pos":{"x":-1.5,"y":-3.25,"z":4},"size":{"x":3,"y":3,"z":1},"inflate":0.29,"mirrored":false},{"tex":{"u":0,"v":41},"pos":{"x":-1,"y":-8.549999999999997,"z":-3.325},"size":{"x":2,"y":5,"z":8},"inflate":0.31,"mirrored":false},{"tex":{"u":30,"v":30},"pos":{"x":-4,"y":-7.75,"z":-3.9999999999999996},"size":{"x":8,"y":7,"z":2},"inflate":0.31,"mirrored":false},{"tex":{"u":0,"v":55},"pos":{"x":-3.5,"y":-8.25,"z":-4.0249999999999995},"size":{"x":7,"y":8,"z":1},"inflate":0.3,"mirrored":false},{"tex":{"u":43,"v":57},"pos":{"x":-1,"y":-1.7063003213556698,"z":-4.467392589507552},"size":{"x":2,"y":2,"z":1},"inflate":0.2,"mirrored":false}],"pos":{"x":0,"y":0,"z":0}},"Head_r1":{"parent":"head","rot":{"pitch":22.522352099877484,"yaw":-2.217376971054876,"roll":-1.1549482224615537},"boxes":[{"tex":{"u":0,"v":2},"pos":{"x":-0.20000000000000018,"y":-0.5000000000000036,"z":-1.625},"size":{"x":1,"y":1,"z":1},"inflate":0,"mirrored":true},{"tex":{"u":32,"v":23},"pos":{"x":-1.7999999999999998,"y":-0.5000000000000036,"z":-0.875},"size":{"x":3,"y":1,"z":4},"inflate":0.3,"mirrored":true}],"pos":{"x":-3.062244097009712,"y":-0.0841351611718899,"z":-4.3276585514508445}},"Head_r2":{"parent":"head","rot":{"pitch":22.522352099877484,"yaw":2.217376971054876,"roll":1.1549482224615537},"boxes":[{"tex":{"u":0,"v":2},"pos":{"x":-0.7999999999999998,"y":-0.5000000000000036,"z":-1.625},"size":{"x":1,"y":1,"z":1},"inflate":0,"mirrored":false},{"tex":{"u":32,"v":23},"pos":{"x":-1.2000000000000002,"y":-0.5000000000000036,"z":-0.875},"size":{"x":3,"y":1,"z":4},"inflate":0.3,"mirrored":false}],"pos":{"x":3.062244097009712,"y":-0.0841351611718899,"z":-4.3276585514508445}},"Head_r3":{"parent":"head","rot":{"pitch":-10,"yaw":0,"roll":0},"boxes":[{"tex":{"u":16,"v":57},"pos":{"x":-2.5,"y":-1.549999999999983,"z":-2.6750000000000003},"size":{"x":5,"y":3,"z":4},"inflate":0.1,"mirrored":false},{"tex":{"u":24,"v":16},"pos":{"x":-4.5,"y":-1.0999999999999943,"z":-2.1750000000000003},"size":{"x":9,"y":3,"z":4},"inflate":0.1,"mirrored":false}],"pos":{"x":0,"y":-8.003334278028035,"z":-2.4475027988833937}},"bone":{"parent":"head","rot":{"pitch":-32.5,"yaw":0,"roll":0},"boxes":[],"pos":{"x":-0.017246570962085706,"y":-0.7813003213556726,"z":-2.2501460185454656}},"Head_r4":{"parent":"bone","rot":{"pitch":0,"yaw":45,"roll":0},"boxes":[{"tex":{"u":44,"v":55},"pos":{"x":-4.575,"y":-2.2500000000000107,"z":-2.4999999999999996},"size":{"x":5,"y":4,"z":5},"inflate":0.3,"mirrored":false}],"pos":{"x":1.4672465709620857,"y":0.25,"z":-1.4672465709620872}}}}

resources/models/armor & clothing/armor/Empire/tie_cold_mask.nemi

@@ -0,0 +1 @@
+{"exporter":"Blockbench 4.8.3","name":"","tex":{"w":64,"h":64},"parts":{"head":{"rot":{"pitch":0,"yaw":0,"roll":0},"boxes":[{"tex":{"u":0,"v":16},"pos":{"x":-4,"y":-8,"z":-4},"size":{"x":8,"y":8,"z":8},"inflate":0.3,"mirrored":false},{"tex":{"u":0,"v":0},"pos":{"x":-4,"y":-8.25,"z":-4},"size":{"x":8,"y":8,"z":8},"inflate":0.5,"mirrored":false},{"tex":{"u":12,"v":48},"pos":{"x":-4,"y":-8,"z":-4},"size":{"x":8,"y":8,"z":8},"inflate":0.7,"mirrored":false},{"tex":{"u":2,"v":32},"pos":{"x":-5,"y":-5.030102612432632,"z":-0.9937081815793525},"size":{"x":10,"y":5,"z":2},"inflate":0.32,"mirrored":false},{"tex":{"u":0,"v":52},"pos":{"x":5.42288543035437,"y":-4.030102612432632,"z":-0.4937081815793525},"size":{"x":0,"y":4,"z":1},"inflate":0,"mirrored":true},{"tex":{"u":0,"v":52},"pos":{"x":-5.42288543035437,"y":-4.030102612432632,"z":-0.4937081815793525},"size":{"x":0,"y":4,"z":1},"inflate":0,"mirrored":false},{"tex":{"u":46,"v":19},"pos":{"x":-2,"y":-9,"z":-0.0499999999999996},"size":{"x":4,"y":9,"z":5},"inflate":0,"mirrored":false},{"tex":{"u":54,"v":0},"pos":{"x":-1.5,"y":-2.549176045059461,"z":-5.613007511676042},"size":{"x":3,"y":3,"z":2},"inflate":0.01,"mirrored":false},{"tex":{"u":46,"v":61},"pos":{"x":-1,"y":-2.549176045059461,"z":-5.663007511676041},"size":{"x":2,"y":3,"z":0},"inflate":0.01,"mirrored":false},{"tex":{"u":0,"v":44},"pos":{"x":-4,"y":-7.5,"z":-3.9999999999999996},"size":{"x":8,"y":7,"z":2},"inflate":0.31,"mirrored":false}],"pos":{"x":0,"y":0,"z":0}},"cube_r1":{"parent":"head","rot":{"pitch":-35,"yaw":0,"roll":0},"boxes":[{"tex":{"u":44,"v":0},"pos":{"x":-1.5099999904632568,"y":-1,"z":-1},"size":{"x":3,"y":2,"z":2},"inflate":0,"mirrored":false}],"pos":{"x":0.009999990463256947,"y":-2.804751643460662,"z":-4.2302790214992605}},"Head_r1":{"parent":"head","rot":{"pitch":-5,"yaw":0,"roll":0},"boxes":[{"tex":{"u":32,"v":8},"pos":{"x":-2,"y":-1.9750000000000014,"z":-2.6749999999999994},"size":{"x":4,"y":4,"z":5},"inflate":0,"mirrored":false}],"pos":{"x":0,"y":-7.25,"z":-2.525}},"Head_r2":{"parent":"head","rot":{"pitch":20.022352099877487,"yaw":-2.2173769710548727,"roll":-1.15494822246155},"boxes":[{"tex":{"u":0,"v":39},"pos":{"x":-1.325000000000002,"y":-0.25,"z":-1.5749999999999993},"size":{"x":3,"y":1,"z":4},"inflate":0.3,"mirrored":true},{"tex":{"u":0,"v":32},"pos":{"x":0.17499999999999805,"y":-0.25,"z":-2.1750000000000025},"size":{"x":1,"y":1,"z":1},"inflate":0,"mirrored":true}],"pos":{"x":-3.567207914727608,"y":-0.6651448173756904,"z":-3.130390661644528}},"Head_r3":{"parent":"head","rot":{"pitch":20.022352099877487,"yaw":2.2173769710548727,"roll":1.15494822246155},"boxes":[{"tex":{"u":0,"v":32},"pos":{"x":-1.174999999999998,"y":-0.25,"z":-2.1750000000000025},"size":{"x":1,"y":1,"z":1},"inflate":0,"mirrored":false},{"tex":{"u":0,"v":39},"pos":{"x":-1.674999999999998,"y":-0.25,"z":-1.5749999999999993},"size":{"x":3,"y":1,"z":4},"inflate":0.3,"mirrored":false}],"pos":{"x":3.567207914727608,"y":-0.6651448173756904,"z":-3.130390661644528}},"cube_r2":{"parent":"head","rot":{"pitch":-5,"yaw":0,"roll":0},"boxes":[{"tex":{"u":24,"v":17},"pos":{"x":-4.5,"y":-1.2999999999999972,"z":-1.8250000000000002},"size":{"x":9,"y":3,"z":4},"inflate":0.3,"mirrored":false}],"pos":{"x":0,"y":-7.25,"z":-2.675}}}}