Added display names and crafting recipes for red and blue hangar lights

Parzivail-Modding-Team · Mar 15, 2021 · 0ce5f9d · 0ce5f9d
1 parent 8503342
commit 0ce5f9d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/com/parzivail/datagen/tarkin/Tarkin.java b/src/main/java/com/parzivail/datagen/tarkin/Tarkin.java
@@ -622,17 +622,17 @@ private static void generateRecipes(List<BuiltAsset> assets)
 			                      .build(assets);
 
 			RecipeGenerator.Shaped.of(new ItemStack(SwgBlocks.Light.RedHangar, 4))
-			                      .grid3x2(null,
+			                      .grid3x3(null,
 			                               null, SwgItems.Ingot.Plasteel, null,
-			                               SwgItems.Ingot.Plasteel, SwgItems.CraftingComponents.LightPanel, SwgItems.Ingot.Plasteel)
+			                               SwgItems.Ingot.Plasteel, SwgItems.CraftingComponents.LightPanel, SwgItems.Ingot.Plasteel,
+			                               null, Items.RED_DYE, null)
 			                      .build(assets);
-
-			// TODO: BlueHangar light recipe, tweak other recipe for colors
-//			RecipeGenerator.Shaped.of(new ItemStack(SwgBlocks.Light.BlueHangar, 4))
-//			                      .grid3x2(null,
-//			                               null, SwgItems.Ingot.Plasteel, null,
-//			                               SwgItems.Ingot.Plasteel, SwgItems.CraftingComponents.LightPanel, SwgItems.Ingot.Plasteel)
-//			                      .build(assets);
+			RecipeGenerator.Shaped.of(new ItemStack(SwgBlocks.Light.BlueHangar, 4))
+			                      .grid3x3(null,
+			                               null, SwgItems.Ingot.Plasteel, null,
+			                               SwgItems.Ingot.Plasteel, SwgItems.CraftingComponents.LightPanel, SwgItems.Ingot.Plasteel,
+			                               null, Items.BLUE_DYE, null)
+				.build(assets);
 
 			RecipeGenerator.Shaped.of(new ItemStack(SwgBlocks.Light.WallCluster, 4))
 			                      .grid3x3(null,

diff --git a/src/main/resources/assets/pswg/lang/en_us.json b/src/main/resources/assets/pswg/lang/en_us.json
@@ -5,7 +5,7 @@
 	"block.pswg.black_kyber_crate": "Black Kyber Crate",
 	"block.pswg.blaster_workbench": "Blaster Workbench",
 	"block.pswg.blossoming_funnel_flower": "Blossoming Funnel Flower",
-	"block.pswg.blue_hangar_light": "pswg:blue_hangar_light",
+	"block.pswg.blue_hangar_light": "Blue Hangar Light",
 	"block.pswg.chiseled_ilum_stone_bricks": "Chiseled Ilum Stone Bricks",
 	"block.pswg.chromium_block": "Block of Chromium",
 	"block.pswg.chromium_ore": "Chromium Ore",
@@ -72,7 +72,7 @@
 	"block.pswg.pourstone": "Pourstone",
 	"block.pswg.pourstone_slab": "Pourstone Slab",
 	"block.pswg.pourstone_stairs": "Pourstone Stairs",
-	"block.pswg.red_hangar_light": "pswg:red_hangar_light",
+	"block.pswg.red_hangar_light": "Red Hangar Light",
 	"block.pswg.sequoia_leaves": "Sequoia Leaves",
 	"block.pswg.sequoia_log": "Sequoia Log",
 	"block.pswg.smooth_ilum_stone": "Smooth Ilum Stone",

diff --git a/src/main/resources/data/pswg/recipes/tarkin/blue_hangar_light.json b/src/main/resources/data/pswg/recipes/tarkin/blue_hangar_light.json
@@ -0,0 +1 @@
+{"type":"minecraft:crafting_shaped","group":"pswg:blue_hangar_light","pattern":[" a ","aba"," c "],"key":{"c":{"item":"minecraft:blue_dye"},"a":{"item":"pswg:plasteel_ingot"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:blue_hangar_light","count":4}}
diff --git a/src/main/resources/data/pswg/recipes/tarkin/red_hangar_light.json b/src/main/resources/data/pswg/recipes/tarkin/red_hangar_light.json
@@ -1 +1 @@
-{"type":"minecraft:crafting_shaped","group":"pswg:red_hangar_light","pattern":[" a ","aba"],"key":{"a":{"item":"pswg:plasteel_ingot"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:red_hangar_light","count":4}}
+{"type":"minecraft:crafting_shaped","group":"pswg:red_hangar_light","pattern":[" a ","aba"," c "],"key":{"a":{"item":"pswg:plasteel_ingot"},"c":{"item":"minecraft:red_dye"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:red_hangar_light","count":4}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"type":"minecraft:crafting_shaped","group":"pswg:blue_hangar_light","pattern":[" a ","aba"," c "],"key":{"c":{"item":"minecraft:blue_dye"},"a":{"item":"pswg:plasteel_ingot"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:blue_hangar_light","count":4}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"type":"minecraft:crafting_shaped","group":"pswg:red_hangar_light","pattern":[" a ","aba"],"key":{"a":{"item":"pswg:plasteel_ingot"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:red_hangar_light","count":4}}
		{"type":"minecraft:crafting_shaped","group":"pswg:red_hangar_light","pattern":[" a ","aba"," c "],"key":{"a":{"item":"pswg:plasteel_ingot"},"c":{"item":"minecraft:red_dye"},"b":{"item":"pswg:light_panel"}},"result":{"item":"pswg:red_hangar_light","count":4}}