Merge branch 'Parzivail-Modding-Team:master' into content-lightsabers

projects/pswg/src/main/java/com/parzivail/pswg/mixin/ServerPlayNetworkHandlerMixin.java

@@ -37,9 +37,13 @@ private void tick(CallbackInfo ci)
 		var jetpack = JetpackItem.getEquippedJetpack(player);
 		if (jetpack != null)
 		{
-			var jt = new JetpackTag(jetpack.getOrCreateNbt());
-			if (jt.enabled)
-				floatingTicks = 0;
+			var tag = jetpack.getOrCreateNbt();
+			if (tag != null)
+			{
+				var jt = new JetpackTag(tag);
+				if (jt.enabled)
+					floatingTicks = 0;
+			}
 		}
 	}
 }

resources/models/armor & clothing/armor/Republic/JediCommander.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"JediCommander","model_identifier":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"left_arm","box_uv":true,"rescale":false,"locked":false,"from":[-7,12,-2],"to":[-4,24,2],"autouv":0,"color":6,"inflate":0.3,"origin":[0,0,0],"uv_offset":[42,44],"faces":{"north":{"uv":[46,48,49,60],"texture":0},"east":{"uv":[42,48,46,60],"texture":0},"south":{"uv":[53,48,56,60],"texture":0},"west":{"uv":[49,48,53,60],"texture":0},"up":{"uv":[49,48,46,44],"texture":0},"down":{"uv":[52,44,49,48],"texture":0}},"type":"cube","uuid":"c50cc9d1-3a29-db55-9306-9efa5e3ae51d"},{"name":"left_sleeve","box_uv":true,"rescale":false,"locked":false,"from":[-7,12,-2],"to":[-4,24,2],"autouv":0,"color":2,"inflate":0.5,"origin":[0,0,0],"uv_offset":[40,16],"faces":{"north":{"uv":[44,20,47,32],"texture":0},"east":{"uv":[40,20,44,32],"texture":0},"south":{"uv":[51,20,54,32],"texture":0},"west":{"uv":[47,20,51,32],"texture":0},"up":{"uv":[47,20,44,16],"texture":0},"down":{"uv":[50,16,47,20],"texture":0}},"type":"cube","uuid":"d8e0afc4-80ea-69fd-9949-f0c767e926a8"},{"name":"4x","box_uv":true,"rescale":false,"locked":false,"from":[-8,12,-2],"to":[-4,24,2],"autouv":0,"color":6,"visibility":false,"inflate":0.3,"origin":[0,0,0],"uv_offset":[16,32],"faces":{"north":{"uv":[20,36,24,48],"texture":0},"east":{"uv":[16,36,20,48],"texture":0},"south":{"uv":[28,36,32,48],"texture":0},"west":{"uv":[24,36,28,48],"texture":0},"up":{"uv":[24,36,20,32],"texture":0},"down":{"uv":[28,32,24,36],"texture":0}},"type":"cube","uuid":"5ee8cd9f-ff8f-6e78-2908-838a2adc8c91"},{"name":"4x","box_uv":true,"rescale":false,"locked":false,"from":[-8,12,-2],"to":[-4,24,2],"autouv":0,"color":2,"visibility":false,"inflate":0.5,"origin":[0,0,0],"uv_offset":[0,32],"faces":{"north":{"uv":[4,36,8,48],"texture":0},"east":{"uv":[0,36,4,48],"texture":0},"south":{"uv":[12,36,16,48],"texture":0},"west":{"uv":[8,36,12,48],"texture":0},"up":{"uv":[8,36,4,32],"texture":0},"down":{"uv":[12,32,8,36],"texture":0}},"type":"cube","uuid":"67b1fe5c-0e93-76ce-fcdc-046751648eb6"},{"name":"right_arm","box_uv":true,"rescale":false,"locked":false,"from":[4,12,-2],"to":[7,24,2],"autouv":0,"color":1,"inflate":0.3,"origin":[0,0,0],"uv_offset":[40,0],"faces":{"north":{"uv":[44,4,47,16],"texture":0},"east":{"uv":[40,4,44,16],"texture":0},"south":{"uv":[51,4,54,16],"texture":0},"west":{"uv":[47,4,51,16],"texture":0},"up":{"uv":[47,4,44,0],"texture":0},"down":{"uv":[50,0,47,4],"texture":0}},"type":"cube","uuid":"0cf3eaa6-ffe9-8615-6b28-75f1457ec331"},{"name":"right_sleeve","box_uv":true,"rescale":false,"locked":false,"from":[4,12,-2],"to":[7,24,2],"autouv":0,"color":2,"inflate":0.5,"origin":[0,0,0],"uv_offset":[32,32],"faces":{"north":{"uv":[36,36,39,48],"texture":0},"east":{"uv":[32,36,36,48],"texture":0},"south":{"uv":[43,36,46,48],"texture":0},"west":{"uv":[39,36,43,48],"texture":0},"up":{"uv":[39,36,36,32],"texture":0},"down":{"uv":[42,32,39,36],"texture":0}},"type":"cube","uuid":"8a303704-49a1-fbba-2aff-a4481cff7094"},{"name":"4x","box_uv":true,"rescale":false,"locked":false,"from":[4,12,-2],"to":[8,24,2],"autouv":0,"color":2,"visibility":false,"inflate":0.5,"origin":[0,0,0],"uv_offset":[24,16],"faces":{"north":{"uv":[28,20,32,32],"texture":0},"east":{"uv":[24,20,28,32],"texture":0},"south":{"uv":[36,20,40,32],"texture":0},"west":{"uv":[32,20,36,32],"texture":0},"up":{"uv":[32,20,28,16],"texture":0},"down":{"uv":[36,16,32,20],"texture":0}},"type":"cube","uuid":"54bec73e-5ee3-a160-1003-bd26fed7fc0a"},{"name":"4x","box_uv":true,"rescale":false,"locked":false,"from":[4,12,-2],"to":[8,24,2],"autouv":0,"color":1,"visibility":false,"inflate":0.3,"origin":[0,0,0],"uv_offset":[24,0],"faces":{"north":{"uv":[28,4,32,16],"texture":0},"east":{"uv":[24,4,28,16],"texture":0},"south":{"uv":[36,4,40,16],"texture":0},"west":{"uv":[32,4,36,16],"texture":0},"up":{"uv":[32,4,28,0],"texture":0},"down":{"uv":[36,0,32,4],"texture":0}},"type":"cube","uuid":"f5b6d115-6191-1f58-98e3-295b1c88a185"},{"name":"body","box_uv":true,"rescale":false,"locked":false,"from":[-4,12,-2],"to":[4,24,2],"autouv":0,"color":0,"inflate":0.31,"origin":[0,0,0],"uv_offset":[0,16],"faces":{"north":{"uv":[4,20,12,32],"texture":0},"east":{"uv":[0,20,4,32],"texture":0},"south":{"uv":[16,20,24,32],"texture":0},"west":{"uv":[12,20,16,32],"texture":0},"up":{"uv":[12,20,4,16],"texture":0},"down":{"uv":[20,16,12,20],"texture":0}},"type":"cube","uuid":"2f87c2be-deb5-87ee-f609-5633413ef78a"},{"name":"jacket","box_uv":true,"rescale":false,"locked":false,"from":[-4,12,-2],"to":[4,24,2],"autouv":0,"color":6,"inflate":0.5,"origin":[0,0,0],"faces":{"north":{"uv":[4,4,12,16],"texture":0},"east":{"uv":[0,4,4,16],"texture":0},"south":{"uv":[16,4,24,16],"texture":0},"west":{"uv":[12,4,16,16],"texture":0},"up":{"uv":[12,4,4,0],"texture":0},"down":{"uv":[20,0,12,4],"texture":0}},"type":"cube","uuid":"f5b7b05a-bb46-7a8e-f8cb-93952897399d"}],"outliner":[{"name":"body","origin":[0,24,0],"color":0,"uuid":"3d62fa6e-36d1-bbc2-6605-d617388ca36a","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["2f87c2be-deb5-87ee-f609-5633413ef78a","f5b7b05a-bb46-7a8e-f8cb-93952897399d"]},{"name":"left_arm","origin":[-5,22,0],"color":0,"uuid":"f20864a5-1c06-8168-7a86-2573e07af395","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"left_arm_slim","origin":[-5,22,0],"color":0,"uuid":"12623608-1fba-c27f-b477-7da681fe1b5c","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["c50cc9d1-3a29-db55-9306-9efa5e3ae51d","d8e0afc4-80ea-69fd-9949-f0c767e926a8"]},{"name":"left_arm_default","origin":[-5,22,0],"color":0,"uuid":"854cdc67-fee7-861c-52bb-00108ec4ec78","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":false,"autouv":0,"children":["5ee8cd9f-ff8f-6e78-2908-838a2adc8c91","67b1fe5c-0e93-76ce-fcdc-046751648eb6"]}]},{"name":"right_arm","origin":[5,22,0],"color":0,"uuid":"dd1fca7c-3cd9-0d9e-8740-51da0071427f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"right_arm_slim","origin":[5,22,0],"color":0,"uuid":"80458bd4-83df-1ef9-e8ac-1a75876ca8e3","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["0cf3eaa6-ffe9-8615-6b28-75f1457ec331","8a303704-49a1-fbba-2aff-a4481cff7094"]},{"name":"right_arm_default","origin":[5,22,0],"color":0,"uuid":"a3d65110-0035-4e8e-ef33-fd04bf65ee39","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":false,"autouv":0,"children":["54bec73e-5ee3-a160-1003-bd26fed7fc0a","f5b6d115-6191-1f58-98e3-295b1c88a185"]}]}],"textures":[{"path":"C:\\Users\\44748\\Desktop\\Blockbench Models\\Parzi Star Wars Mod\\Armor\\Jedi\\JediCommander.png","name":"JediCommander.png","folder":"block","namespace":"","id":"0","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"1c0d31ca-f6fb-ad80-2c54-d1a7250ad9b4","relative_path":"../JediCommander.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAkRJREFUeF7tmsFKAzEQhtMXsE9Q1HNrPYt4FvEu4gMIgo8jCD6AiHcRzyKere1ZpU+wvkDlXxyIa5JNmmY72Z1cstCZZubLn2nSTU813GbTyQJDfheF2ts/6IUO//ryXPov42saKziA0ICr9gJAFNCxJUCSry4FVw3AOt/o90sX2JmarQaE1ojkNcAEgJKqSwIQYGuCUefrWySTA3h6fCirdrUVRaFOTs+M49/f3S76vwpY1vfw6NgrNy+jmMqPZEz+tuTJVvcjGICG5uNbZ0PjJAcQA68JXwHQBGXOY4gCOM9OE7GJApqgzHkMUUB1dmgX9vX58eejza1t5dq9cZ5lV2z/FAAAri2q7w4rFyACoPNLwHRYweHDVgNM0nbZc18yPX3NE4zhaKRm06lCj0bP6PXTmI99lgAGg4Gaz+cKPRo9ozcBcNmzB3BzfbU4v7gsiyGe0e+Md9X75K3s0egZPVqIPdly/VWwboQAA7/9aKgHdYmE2nMBIjtBLjOxrjhEAesiz2VcUQCXmVhXHKKAFOT1d3vD0Zg15CTBCQDt7a4ooOtLwFZjlr0jtOqalawGIFB6r18Nuu5+wKqTdH1fEgB17/cREJd/mJMAQIK2ewE0G1z+KEkGoEkZx4wlAGLotcFXFJDzLIbeCTTlmrUCBMAKbo6LAtpQA2w5+FyXbYUC9HOHfrm69QBcZw7fs0bWCtDPHKH3iWnZZA8gtoYJgFiCufuLAnKfwdj4RQGxBHP3FwXkPoOx8YsCYgnm7t95BfwAZ2FiUIjIp+UAAAAASUVORK5CYII="}],"fabricOptions":{"header":"package com.example.mod;","entity":"Entity","render":"","members":""}}

resources/models/items/Electrobinoculars/Electrobinoculars.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"Electrobinoculars","model_identifier":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-3.5,0,-6],"to":[3.5,3,1],"autouv":0,"color":1,"origin":[0,0,0],"uv_offset":[0,11],"faces":{"north":{"uv":[7,18,14,21],"texture":0},"east":{"uv":[0,18,7,21],"texture":0},"south":{"uv":[21,18,28,21],"texture":0},"west":{"uv":[14,18,21,21],"texture":0},"up":{"uv":[14,18,7,11],"texture":0},"down":{"uv":[21,11,14,18],"texture":0}},"type":"cube","uuid":"a7e84e28-cf89-6a3a-d357-7b3d4b4e58ad"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-3,0.5,0.5],"to":[3,2.5,2.5],"autouv":0,"color":1,"origin":[0,0,0],"uv_offset":[0,21],"faces":{"north":{"uv":[2,23,8,25],"texture":0},"east":{"uv":[0,23,2,25],"texture":0},"south":{"uv":[10,23,16,25],"texture":0},"west":{"uv":[8,23,10,25],"texture":0},"up":{"uv":[8,23,2,21],"texture":0},"down":{"uv":[14,21,8,23],"texture":0}},"type":"cube","uuid":"8ab944d5-a5ed-5136-c113-bfbf17e4db51"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-3.5,0,-6],"to":[3.5,3,1],"autouv":0,"color":1,"inflate":0.1,"origin":[0,0,0],"uv_offset":[0,1],"faces":{"north":{"uv":[7,8,14,11],"texture":0},"east":{"uv":[0,8,7,11],"texture":0},"south":{"uv":[21,8,28,11],"texture":0},"west":{"uv":[14,8,21,11],"texture":0},"up":{"uv":[14,8,7,1],"texture":0},"down":{"uv":[21,1,14,8],"texture":0}},"type":"cube","uuid":"66bdbd79-b583-538e-637a-a263c3640476"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-1,0.5,-6.75],"to":[1,2.5,-5.75],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[1,1,3,3],"texture":0},"east":{"uv":[0,1,1,3],"texture":0},"south":{"uv":[4,1,6,3],"texture":0},"west":{"uv":[3,1,4,3],"texture":0},"up":{"uv":[3,1,1,0],"texture":0},"down":{"uv":[5,0,3,1],"texture":0}},"type":"cube","uuid":"aeb11da4-f204-704b-2286-f3c3de55a6a4"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-1,0.5,-6.5],"to":[1,2.5,-6.5],"autouv":0,"color":1,"origin":[0,0,0],"uv_offset":[0,6],"faces":{"north":{"uv":[0,6,2,8],"texture":0},"east":{"uv":[0,6,0,8],"texture":0},"south":{"uv":[2,6,4,8],"texture":0},"west":{"uv":[2,6,2,8],"texture":0},"up":{"uv":[2,6,0,6],"texture":0},"down":{"uv":[4,6,2,6],"texture":0}},"type":"cube","uuid":"02225219-1226-f324-86b4-613c8c48ca9e"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[2.25,1.5,-6.75],"to":[3.25,2.5,-5.75],"autouv":0,"color":1,"origin":[0,0,0],"uv_offset":[3,4],"faces":{"north":{"uv":[4,5,5,6],"texture":0},"east":{"uv":[3,5,4,6],"texture":0},"south":{"uv":[6,5,7,6],"texture":0},"west":{"uv":[5,5,6,6],"texture":0},"up":{"uv":[5,5,4,4],"texture":0},"down":{"uv":[6,4,5,5],"texture":0}},"type":"cube","uuid":"b864e958-36a9-051e-9275-ca445d916b7b"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[1.0749999999999997,3,-1.4999999999999996],"to":[2.0749999999999997,4,-0.5000000000000001],"autouv":0,"color":1,"origin":[0,0,0],"uv_offset":[0,3],"faces":{"north":{"uv":[0.9999999999999994,3.9999999999999996,1.9999999999999996,5],"texture":0},"east":{"uv":[0,3.9999999999999996,0.9999999999999994,5],"texture":0},"south":{"uv":[2.999999999999999,3.9999999999999996,3.999999999999999,5],"texture":0},"west":{"uv":[1.9999999999999996,3.9999999999999996,2.999999999999999,5],"texture":0},"up":{"uv":[1.9999999999999996,3.9999999999999996,0.9999999999999996,3],"texture":0},"down":{"uv":[2.9999999999999996,3,1.9999999999999996,3.9999999999999996],"texture":0}},"type":"cube","uuid":"03d54eff-d08f-30e0-c4f9-7b5dfa64a1ef"}],"outliner":[{"name":"Electrobinocular","origin":[0,0,0],"color":0,"uuid":"e0e678f3-48af-a166-4c9e-2ff6646f219c","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["a7e84e28-cf89-6a3a-d357-7b3d4b4e58ad","8ab944d5-a5ed-5136-c113-bfbf17e4db51","66bdbd79-b583-538e-637a-a263c3640476","aeb11da4-f204-704b-2286-f3c3de55a6a4","02225219-1226-f324-86b4-613c8c48ca9e","b864e958-36a9-051e-9275-ca445d916b7b","03d54eff-d08f-30e0-c4f9-7b5dfa64a1ef"]}],"textures":[{"path":"C:\\Users\\44748\\Desktop\\Blockbench Models\\Parzi Star Wars Mod\\Items\\electrobinoculars.png","name":"electrobinoculars.png","folder":"block","namespace":"","id":"0","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"b373a306-2e07-6ae6-6818-256b39122c12","relative_path":"../electrobinoculars.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAZNJREFUWEdjZGBgYDh65PB/EP3t61cQxeDq7sEIZtABMIIst7axBVsIYr9+9RJsbUBQCF0cwbh7547/MB+D2F+/fkFxAEiMlqEC9znIElhIIIc8zR0Ai3/06MbmGFokCZR4RncMPRzBqKys9l9YRJTh1MmjdEl06KHIKC4uCU5kL18+HxgH0CJeSTGTZF+Douzu3Vsk68PlKKoZRIqvkdXidQCsDODi5obrgRXXMAFscqQU5XgdMKmv57+AoCDDh/fvGdBpkANwyeUVlRAdsgQdIKegwPDowQMGdBrkAFxyow6gaggMaBogJhdgy34k5QKQJdevXsEwR1NbBy6GKxuSow/dceAGyfNnTxn4+PnhFn76+JFBUkoazAfJIYPGlk6GGdMmweVw6QM5buLUWQz52WlwGuQprA4g5BNcpRwhfcQUUvByAD2+6dVAhTtg0fy5/5GDE+RrUFTEJSYTXaqRUx/A0wAui0AOA6UHUlI2KQ4B+w65ZYyuGZ8cKRYNzeqYGj4kZAZNExghy0Hyow4YDQEADK4ZMML2nHUAAAAASUVORK5CYII="}],"fabricOptions":{"header":"package com.example.mod;","entity":"Entity","render":"","members":""}}