From 407616c2a703fa7a1ad51119ed8c1f25ef5e9831 Mon Sep 17 00:00:00 2001 From: parzivail Date: Mon, 30 Oct 2023 21:38:00 -0400 Subject: [PATCH] normalize item and texture names --- .../src/main/java/com/parzivail/pswg/Client.java | 4 ++-- .../java/com/parzivail/pswg/container/SwgItems.java | 2 +- .../src/main/resources/assets/pswg/lang/en_us.json | 10 +++++++--- ...helmet.json => imperial_pilot_cadet_helmet.json} | 2 +- ...e_cadet.json => imperial_pilot_cold_helmet.json} | 2 +- ...et.json => imperial_pilot_technical_helmet.json} | 2 +- ...ie_cadet.png => imperial_pilot_cadet_helmet.png} | Bin ...ld_helmet.png => imperial_pilot_cold_helmet.png} | Bin ...lmet.png => imperial_pilot_technical_helmet.png} | Bin .../data/trinkets/tags/items/chest/back.json | 2 +- 10 files changed, 14 insertions(+), 10 deletions(-) rename projects/pswg/src/main/resources/assets/pswg/models/item/{tie_cold_helmet.json => imperial_pilot_cadet_helmet.json} (64%) rename projects/pswg/src/main/resources/assets/pswg/models/item/{tie_cadet.json => imperial_pilot_cold_helmet.json} (64%) rename projects/pswg/src/main/resources/assets/pswg/models/item/{tie_technical_helmet.json => imperial_pilot_technical_helmet.json} (61%) rename projects/pswg/src/main/resources/assets/pswg/textures/item/{tie_cadet.png => imperial_pilot_cadet_helmet.png} (100%) rename projects/pswg/src/main/resources/assets/pswg/textures/item/{tie_cold_helmet.png => imperial_pilot_cold_helmet.png} (100%) rename projects/pswg/src/main/resources/assets/pswg/textures/item/{tie_technical_helmet.png => imperial_pilot_technical_helmet.png} (100%) diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/Client.java b/projects/pswg/src/main/java/com/parzivail/pswg/Client.java index 9b4d89830..045d010b2 100644 --- a/projects/pswg/src/main/java/com/parzivail/pswg/Client.java +++ b/projects/pswg/src/main/java/com/parzivail/pswg/Client.java @@ -680,7 +680,7 @@ private static void registerArmor() ); ArmorRenderer.register( SwgItems.Armor.ImperialPilotTechnicalHelmet, - Resources.id("imperial_pilot_technical_helmet"), + Resources.id("imperial_pilot_technical"), new ArmorRenderer.Assets( Resources.id("armor/tie_technical_helmet"), Resources.id("textures/armor/tie_technical_helmet.png") @@ -689,7 +689,7 @@ private static void registerArmor() ); ArmorRenderer.register( SwgItems.Armor.ImperialPilotColdHelmet, - Resources.id("imperial_pilot_cold_helmet"), + Resources.id("imperial_pilot_cold"), new ArmorRenderer.Assets( Resources.id("armor/tie_cold_helmet"), Resources.id("textures/armor/tie_cold_helmet.png") diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/container/SwgItems.java b/projects/pswg/src/main/java/com/parzivail/pswg/container/SwgItems.java index b2352be84..a421b112d 100644 --- a/projects/pswg/src/main/java/com/parzivail/pswg/container/SwgItems.java +++ b/projects/pswg/src/main/java/com/parzivail/pswg/container/SwgItems.java @@ -93,7 +93,7 @@ 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("imperial_pilot_cadet") + @RegistryName("imperial_pilot_cadet_helmet") @TarkinItem public static final ArmorItem ImperialPilotCadetHelmet = new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.Type.HELMET, new Item.Settings().maxCount(1)); @RegistryName("imperial_pilot_technical_helmet") diff --git a/projects/pswg/src/main/resources/assets/pswg/lang/en_us.json b/projects/pswg/src/main/resources/assets/pswg/lang/en_us.json index 4a54c0f99..142ee10a8 100644 --- a/projects/pswg/src/main/resources/assets/pswg/lang/en_us.json +++ b/projects/pswg/src/main/resources/assets/pswg/lang/en_us.json @@ -503,6 +503,7 @@ "item.pswg.chromium_ingot": "Chromium Ingot", "item.pswg.chromium_nugget": "Chromium Nugget", "item.pswg.citrus_soda": "Citrus Soda", + "item.pswg.cj33_jetpack": "§oMerr-Sonn§r CJ-33 Jetpack", "item.pswg.classic_soda": "Classic Soda", "item.pswg.cooked_bantha_chop": "Bantha Steak", "item.pswg.cooked_eopie_loin": "Cooked Eopie Loin", @@ -591,8 +592,11 @@ "item.pswg.hovertankpilot_helmet": "Hovertank Pilot Helmet", "item.pswg.hovertankpilot_leggings": "Hovertank Pilot Leggings", "item.pswg.hubba_gourd": "Hubba Gourd", + "item.pswg.imperial_pilot_cadet_helmet": "Imperial Pilot Cadet Helmet", + "item.pswg.imperial_pilot_cold_helmet": "Imperial Pilot Cold Helmet", "item.pswg.imperial_pilot_helmet": "Imperial Pilot Helmet", "item.pswg.imperial_pilot_kit": "Imperial Pilot Kit", + "item.pswg.imperial_pilot_technical_helmet": "Imperial Pilot Technical Helmet", "item.pswg.incineratortrooper_boots": "Incinerator Trooper Boots", "item.pswg.incineratortrooper_chestplate": "Incinerator Trooper Chestplate", "item.pswg.incineratortrooper_helmet": "Incinerator Trooper Helmet", @@ -604,6 +608,7 @@ "item.pswg.jerba_rack": "Jerba Rack", "item.pswg.jerba_rib": "Jerba Rib", "item.pswg.jogan_fruit": "Jogan Fruit", + "item.pswg.jt12_jetpack": "§oMerr-Sonn§r JT-12 Jetpack", "item.pswg.jumptrooper_boots": "Jumptrooper Boots", "item.pswg.jumptrooper_chestplate": "Jumptrooper Chestplate", "item.pswg.jumptrooper_helmet": "Jumptrooper Helmet", @@ -668,6 +673,7 @@ "item.pswg.raw_sketto_nugget": "Raw Sketto Nugget", "item.pswg.raw_titanium": "Raw Titanium", "item.pswg.rebel_forest_helmet": "Rebel Forest Helmet", + "item.pswg.rebel_jump_pack": "GTL-1N Jump Pack", "item.pswg.rebel_pilot_helmet": "K-22995 Light Flight Helmet", "item.pswg.rebel_pilot_kit": "Rebel Pilot Kit", "item.pswg.rebel_tropical_helmet": "Rebel Tropical Helmet", @@ -714,9 +720,6 @@ "item.pswg.tan_light_backpack": "Tan Light Backpack", "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", @@ -737,6 +740,7 @@ "item.pswg.worrt_egg": "Worrt Egg", "item.pswg.yellow_cup": "Yellow Cup", "item.pswg.yellow_door_insert": "Yellow Door Insert", + "item.pswg.z6_jetpack": "§oMitrinomon§r Z6 Jetpack", "item.pswg.zersium_crystal": "Zersium Crystal", "item.pswg.zersium_dust": "Zersium Dust", "itemGroup.pswg.blasters": "Blasters - PSWG", diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_cold_helmet.json b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cadet_helmet.json similarity index 64% rename from projects/pswg/src/main/resources/assets/pswg/models/item/tie_cold_helmet.json rename to projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cadet_helmet.json index 874de340a..2f600f426 100644 --- a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_cold_helmet.json +++ b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cadet_helmet.json @@ -1 +1 @@ -{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/tie_cold_helmet"}} +{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/imperial_pilot_cadet_helmet"}} diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_cadet.json b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cold_helmet.json similarity index 64% rename from projects/pswg/src/main/resources/assets/pswg/models/item/tie_cadet.json rename to projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cold_helmet.json index 8fccb2211..0af101b8a 100644 --- a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_cadet.json +++ b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_cold_helmet.json @@ -1 +1 @@ -{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/tie_cadet"}} +{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/imperial_pilot_cold_helmet"}} diff --git a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_technical_helmet.json b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_technical_helmet.json similarity index 61% rename from projects/pswg/src/main/resources/assets/pswg/models/item/tie_technical_helmet.json rename to projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_technical_helmet.json index 0ea461d8a..cf6d88c56 100644 --- a/projects/pswg/src/main/resources/assets/pswg/models/item/tie_technical_helmet.json +++ b/projects/pswg/src/main/resources/assets/pswg/models/item/imperial_pilot_technical_helmet.json @@ -1 +1 @@ -{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/tie_technical_helmet"}} +{"parent":"minecraft:item/generated","textures":{"layer0":"pswg:item/imperial_pilot_technical_helmet"}} diff --git a/projects/pswg/src/main/resources/assets/pswg/textures/item/tie_cadet.png b/projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_cadet_helmet.png similarity index 100% rename from projects/pswg/src/main/resources/assets/pswg/textures/item/tie_cadet.png rename to projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_cadet_helmet.png diff --git a/projects/pswg/src/main/resources/assets/pswg/textures/item/tie_cold_helmet.png b/projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_cold_helmet.png similarity index 100% rename from projects/pswg/src/main/resources/assets/pswg/textures/item/tie_cold_helmet.png rename to projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_cold_helmet.png diff --git a/projects/pswg/src/main/resources/assets/pswg/textures/item/tie_technical_helmet.png b/projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_technical_helmet.png similarity index 100% rename from projects/pswg/src/main/resources/assets/pswg/textures/item/tie_technical_helmet.png rename to projects/pswg/src/main/resources/assets/pswg/textures/item/imperial_pilot_technical_helmet.png diff --git a/projects/pswg/src/main/resources/data/trinkets/tags/items/chest/back.json b/projects/pswg/src/main/resources/data/trinkets/tags/items/chest/back.json index bc28eed37..2b2bd19f2 100644 --- a/projects/pswg/src/main/resources/data/trinkets/tags/items/chest/back.json +++ b/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","pswg:cj32_jetpack","pswg:cj33_jetpack","pswg:jt12_jetpack","pswg:z6_jetpack","pswg:rebel_jump_pack"]} +{"values":["pswg:artillerytrooper_backpack","pswg:brown_specialist_backpack","pswg:cj33_jetpack","pswg:green_heavy_backpack","pswg:green_light_backpack","pswg:green_specialist_backpack","pswg:incineratortrooper_tank","pswg:jt12_jetpack","pswg:jumptrooper_jetpack","pswg:rebel_jump_pack","pswg:sandtrooper_backpack","pswg:tan_heavy_backpack","pswg:tan_light_backpack","pswg:white_heavy_backpack","pswg:white_light_backpack","pswg:z6_jetpack"]}