Merge branch 'content-lightsabers'

Parzivail-Modding-Team · Nov 19, 2023 · 39121e8 · 39121e8
2 parents 603ad07 + 130a7b1
commit 39121e8
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 1 deletion.
diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/BaseContent.java b/projects/pswg/src/main/java/com/parzivail/pswg/BaseContent.java
@@ -638,7 +638,16 @@ private static void registerLightsabers()
 						.unstable()
 						.bladeLength("blade_secondary_l", 0.15f)
 						.bladeLength("blade_secondary_r", 0.15f),
-				new LightsaberDescriptor(Resources.id("dume"), "Kanan Jarrus", ColorUtil.packHsv(0.62f, 1, 1), LightsaberBladeType.DEFAULT)
+				new LightsaberDescriptor(Resources.id("dume"), "Kanan Jarrus", ColorUtil.packHsv(0.62f, 1, 1), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("mace"), "Mace Windu", ColorUtil.packHsv(0.81f, 1, 1), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("shaagi"), "Sha'a Gi", ColorUtil.packHsv(0.33f, 1, 1), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("starkiller"), "Galen Marek", ColorUtil.packHsv(0.62f, 1, 1), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("yoda"), "Yoda", ColorUtil.packHsv(0.33f, 1, 1), LightsaberBladeType.DEFAULT).bladeLength("blade_primary", 0.5f),
+				new LightsaberDescriptor(Resources.id("ahsoka_cw"), "Ahsoka", ColorUtil.packHsv(0.33f, 1, 1), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("ahsoka_cw_shoto"), "Shoto Ahsoka", ColorUtil.packHsv(0.23f, 1, 1), LightsaberBladeType.DEFAULT).bladeLength("blade_primary", 0.5f),
+				new LightsaberDescriptor(Resources.id("ahsoka_rebel"), "Ahsoka", ColorUtil.packHsv(0.66f, 0, 0.66f), LightsaberBladeType.DEFAULT),
+				new LightsaberDescriptor(Resources.id("ahsoka_rebel_shoto"), "Shoto Ahsoka", ColorUtil.packHsv(0.66f, 0, 0.66f), LightsaberBladeType.DEFAULT).bladeLength("blade_primary", 0.75f)
+
 		);
 
 		if (FabricLoader.getInstance().isDevelopmentEnvironment())

diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_cw.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_cw.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_cw_shoto.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_cw_shoto.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_rebel.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_rebel.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_rebel_shoto.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/ahsoka_rebel_shoto.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/mace.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/mace.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/shaagi.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/shaagi.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/starkiller.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/starkiller.p3d
diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/yoda.p3d b/projects/pswg/src/main/resources/assets/pswg/models/item/lightsaber/yoda.p3d
diff --git a/...swg/src/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_cw.png b/...swg/src/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_cw.png
diff --git a/...c/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_cw_shoto.png b/...c/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_cw_shoto.png
diff --git a/.../src/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_rebel.png b/.../src/main/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_rebel.png
diff --git a/...ain/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_rebel_shoto.png b/...ain/resources/assets/pswg/textures/item/model/lightsaber/ahsoka_rebel_shoto.png
diff --git a/...cts/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/mace.png b/...cts/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/mace.png
diff --git a/...s/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/shaagi.png b/...s/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/shaagi.png
diff --git a/...wg/src/main/resources/assets/pswg/textures/item/model/lightsaber/starkiller.png b/...wg/src/main/resources/assets/pswg/textures/item/model/lightsaber/starkiller.png
diff --git a/...cts/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/yoda.png b/...cts/pswg/src/main/resources/assets/pswg/textures/item/model/lightsaber/yoda.png
diff --git a/resources/models/sabers/ahsokaCW/ahsokaCW.p3di b/resources/models/sabers/ahsokaCW/ahsokaCW.p3di
diff --git a/resources/models/sabers/ahsokaCWshoto/ahsokaCWshoto.p3di b/resources/models/sabers/ahsokaCWshoto/ahsokaCWshoto.p3di
diff --git a/resources/models/sabers/ahsokaRebel/ahsoka_rebel.p3di b/resources/models/sabers/ahsokaRebel/ahsoka_rebel.p3di
diff --git a/resources/models/sabers/ahsokaRebelShoto/ahsokaRebelShoto.p3di b/resources/models/sabers/ahsokaRebelShoto/ahsokaRebelShoto.p3di
diff --git a/resources/models/sabers/maceSaber/mace.p3di b/resources/models/sabers/maceSaber/mace.p3di
diff --git a/resources/models/sabers/shaagiSaber/shaagi.p3di b/resources/models/sabers/shaagiSaber/shaagi.p3di
diff --git a/resources/models/sabers/starkillerSaber/starkiller.p3di b/resources/models/sabers/starkillerSaber/starkiller.p3di
diff --git a/resources/models/sabers/yodaSaber/yoda.p3di b/resources/models/sabers/yodaSaber/yoda.p3di