Multiple lightsabers

Parzivail-Modding-Team · Nov 1, 2023 · 6822648 · 6822648
1 parent 407616c
commit 6822648
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 0 deletions.
diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/BaseContent.java b/projects/pswg/src/main/java/com/parzivail/pswg/BaseContent.java
@@ -639,6 +639,11 @@ private static void registerLightsabers()
 						.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)
 		);
 
 		if (FabricLoader.getInstance().isDevelopmentEnvironment())

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/...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/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