From 667b26c8b7448c2cf0a3a54b911481389ecb5f5a Mon Sep 17 00:00:00 2001
From: MrTJP <mrtjp@icloud.com>
Date: Sun, 6 Feb 2022 15:45:30 -0500
Subject: [PATCH] fix: uncoloured to coloured bundled cable recipes

---
 .../tags/items/bundled_wire.json                   |  1 +
 .../tags/items/framed_bundled_wire.json            |  1 +
 .../mrtjp/projectred/transmission/content.scala    | 14 ++++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/transmission/generated/data/projectred-transmission/tags/items/bundled_wire.json b/src/transmission/generated/data/projectred-transmission/tags/items/bundled_wire.json
index 6e49ae4e2..35e9a87ea 100644
--- a/src/transmission/generated/data/projectred-transmission/tags/items/bundled_wire.json
+++ b/src/transmission/generated/data/projectred-transmission/tags/items/bundled_wire.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "projectred-transmission:neutral_bundled_wire",
     "projectred-transmission:white_bundled_wire",
     "projectred-transmission:orange_bundled_wire",
     "projectred-transmission:magenta_bundled_wire",
diff --git a/src/transmission/generated/data/projectred-transmission/tags/items/framed_bundled_wire.json b/src/transmission/generated/data/projectred-transmission/tags/items/framed_bundled_wire.json
index b2c57828a..29808a53e 100644
--- a/src/transmission/generated/data/projectred-transmission/tags/items/framed_bundled_wire.json
+++ b/src/transmission/generated/data/projectred-transmission/tags/items/framed_bundled_wire.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "projectred-transmission:neutral_framed_bundled_wire",
     "projectred-transmission:white_framed_bundled_wire",
     "projectred-transmission:orange_framed_bundled_wire",
     "projectred-transmission:magenta_framed_bundled_wire",
diff --git a/src/transmission/scala/mrtjp/projectred/transmission/content.scala b/src/transmission/scala/mrtjp/projectred/transmission/content.scala
index d84e44e07..79919abcb 100644
--- a/src/transmission/scala/mrtjp/projectred/transmission/content.scala
+++ b/src/transmission/scala/mrtjp/projectred/transmission/content.scala
@@ -128,7 +128,7 @@ object TransmissionContent {
         itemInsulatedBlackWire.get
     )
 
-    lazy val bundledWires = List(
+    lazy val colouredBundledWires = List(
         itemBundledWhiteWire.get,
         itemBundledOrangeWire.get,
         itemBundledMagentaWire.get,
@@ -166,7 +166,7 @@ object TransmissionContent {
         itemFramedInsulatedBlackWire.get
     )
 
-    lazy val framedBundledWires = List(
+    lazy val framedColouredBundledWires = List(
         itemFramedBundledWhiteWire.get,
         itemFramedBundledOrangeWire.get,
         itemFramedBundledMagentaWire.get,
@@ -413,6 +413,7 @@ private class ItemTags(gen: DataGenerator, fileHelper:ExistingFileHelper) extend
             .add(itemInsulatedBlackWire)
 
         tag(tagItemBundledWire)
+            .add(itemBundledNeutralWire)
             .add(itemBundledWhiteWire)
             .add(itemBundledOrangeWire)
             .add(itemBundledMagentaWire)
@@ -449,6 +450,7 @@ private class ItemTags(gen: DataGenerator, fileHelper:ExistingFileHelper) extend
             .add(itemFramedInsulatedBlackWire)
 
         tag(tagItemBundledFramedWire)
+            .add(itemFramedBundledNeutralWire)
             .add(itemFramedBundledWhiteWire)
             .add(itemFramedBundledOrangeWire)
             .add(itemFramedBundledMagentaWire)
@@ -502,7 +504,7 @@ private class Recipes(gen: DataGenerator) extends RecipeProvider(gen) {
             .patternLine("WWW")
             .patternLine("SWS")
 
-        for (w <- bundledWires) {
+        for (w <- colouredBundledWires) {
             shapelessRecipe(w, 1, new ResourceLocation(w.getRegistryName + "_re_color"))
                 .addIngredient(tagItemBundledWire)
                 .addIngredient(ItemTags.bind(w.wireType.getColour.getDyeTagName))
@@ -544,11 +546,11 @@ private class Recipes(gen: DataGenerator) extends RecipeProvider(gen) {
                 .addIngredient(ItemTags.bind(w.wireType.getColour.getDyeTagName))
         }
 
-        for (i <- bundledWires.indices) {
-            val w = framedBundledWires(i);
+        for (i <- colouredBundledWires.indices) {
+            val w = framedColouredBundledWires(i);
             shapedRecipe(w)
                     .key('S', ForgeItemTags.RODS_WOODEN)
-                    .key('I', bundledWires(i))
+                    .key('I', colouredBundledWires(i))
                     .patternLine("SSS")
                     .patternLine("SIS")
                     .patternLine("SSS")