Covered dense cables (#3030)

* Renamed all dense smart cable related things to include smart
* Added dense covered cables
* Added abstract PartDenseCable to reduce redundant code
* Added dense covered recipes

* Ensures ItemPart ordering to be consitent.

Now takes the metadata into account to preserve the ordering for colored
items instead of just the part type name and depend on the insertion
order of a hashmap.

src/main/resources/assets/appliedenergistics2/lang/en_us.lang

@@ -457,6 +457,7 @@ item.appliedenergistics2.multi_part.cable_anchor.name=Cable Anchor
 item.appliedenergistics2.multi_part.cable_covered.name=ME Covered Cable
 item.appliedenergistics2.multi_part.cable_glass.name=ME Glass Cable
 item.appliedenergistics2.multi_part.cable_smart.name=ME Smart Cable
+item.appliedenergistics2.multi_part.cable_dense_covered.name=ME Dense Covered Cable
 item.appliedenergistics2.multi_part.cable_dense_smart.name=ME Dense Smart Cable
 item.appliedenergistics2.multi_part.storage_monitor.name=ME Storage Monitor
 item.appliedenergistics2.multi_part.conversion_monitor.name=ME Conversion Monitor

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_base.json

@@ -0,0 +1,21 @@
+{
+  "parent": "appliedenergistics2:item/part/part",
+  "textures": {
+    "channels": "appliedenergistics2:parts/cable/dense_covered/0"
+  },
+  "elements": [
+    {
+      "name": "Base",
+      "from": [ 4.0, 4.0, 2.0 ],
+      "to": [ 12.0, 12.0, 14.0 ],
+      "faces": {
+        "north": { "texture": "#base", "uv": [ 4.0, 4.0, 12.0, 11.0 ] },
+        "east": { "texture": "#base", "uv": [ 0.0, 4.0, 4.0, 12.0 ] },
+        "south": { "texture": "#base", "uv": [ 11.0, 4.0, 4.0, 12.0 ] },
+        "west": { "texture": "#base", "uv": [ 4.0, 4.0, 0.0, 12.0 ] },
+        "up": { "texture": "#base", "uv": [ 4.0, 0.0, 12.0, 5.0 ] },
+        "down": { "texture": "#base", "uv": [ 4.0, 12.0, 12.0, 16.0 ] }
+      }
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_black.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/black"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_blue.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/blue"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_brown.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/brown"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_cyan.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/cyan"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_gray.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/gray"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_green.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/green"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_light_blue.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/light_blue"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_light_gray.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/light_gray"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_lime.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/lime"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_magenta.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/magenta"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_orange.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/orange"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_pink.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/pink"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_purple.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/purple"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_red.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/red"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_transparent.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/transparent"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_white.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/white"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_yellow.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/cable_dense_covered_base",
+  "textures": {
+    "base": "appliedenergistics2:parts/cable/dense_covered/yellow"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json

@@ -0,0 +1,20 @@
+{
+    "textures": {
+        "base": "appliedenergistics2:parts/cable/dense_covered/${color}"
+    },
+    "elements": [
+        {
+            "name": "Element",
+            "from": [ 3.0, 3.0, 3.0 ], 
+            "to": [ 13.0, 13.0, 13.0 ], 
+            "faces": {
+                "north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
+                "east": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
+                "south": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] },
+                "west": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] },
+                "up": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
+                "down": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json

@@ -0,0 +1,20 @@
+{
+    "textures": {
+        "base": "appliedenergistics2:parts/cable/dense_covered/${color}"
+    },
+    "elements": [
+        {
+            "name": "Element",
+            "from": [ 4.0, 4.0, 0.0 ], 
+            "to": [ 12.0, 12.0, 8.0 ], 
+            "faces": {
+                "north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
+                "east": { "texture": "#base", "uv": [ 11.0, 5.5, 16.0, 10.5 ] },
+                "south": { "texture": "#base", "uv": [ 10.5, 10.5, 5.5, 5.5 ] },
+                "west": { "texture": "#base", "uv": [ 16.0, 5.5, 11.0, 10.5 ] },
+                "up": { "texture": "#base", "uv": [ 5.5, 0.0, 10.5, 5.0 ] },
+                "down": { "texture": "#base", "uv": [ 5.5, 11.0, 10.5, 16.0 ] }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json

@@ -0,0 +1,20 @@
+{
+    "textures": {
+        "base": "appliedenergistics2:parts/cable/dense_covered/${color}"
+    },
+    "elements": [
+        {
+            "name": "Element",
+            "from": [ 3.0, 3.0, 0.0 ], 
+            "to": [ 13.0, 13.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
+                "east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
+                "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
+                "west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
+                "up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
+                "down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.black",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeBlack"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.blue",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeBlue"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.brown",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeBrown"
+    },
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.cyan",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeCyan"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json

@@ -0,0 +1,25 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.fluix"
+  },
+  "type": "appliedenergistics2:part_shapeless",
+  "ingredients": [
+    {
+      "type": "appliedenergistics2:part",
+      "part": "cable_covered.fluix"
+    },
+    {
+      "type": "appliedenergistics2:part",
+      "part": "cable_covered.fluix"
+    },
+    {
+      "type": "appliedenergistics2:part",
+      "part": "cable_covered.fluix"
+    },
+    {
+      "type": "appliedenergistics2:part",
+      "part": "cable_covered.fluix"
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json

@@ -0,0 +1,16 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.fluix"
+  },
+  "type": "appliedenergistics2:part_shapeless",
+  "ingredients": [
+    {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered"
+    },
+    {
+      "item": "minecraft:water_bucket"
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.gray",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeGray"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.green",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeGreen"
+    },
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.light_blue",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeLightBlue"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.light_gray",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeLightGray"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.lime",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeLime"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.magenta",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeMagenta"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.orange",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeOrange"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.pink",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyePink"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.purple",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyePurple"
+    },
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.red",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeRed"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.white",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    },
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeWhite"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json

@@ -0,0 +1,23 @@
+{
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "cable_dense_covered.yellow",
+    "count": 8
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "aaa",
+    "aba",
+    "aaa"
+  ],
+  "key": {
+    "b": {
+      "type": "forge:ore_dict",
+      "ore": "dyeYellow"
+    },
+    "a": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_dense_covered.fluix"
+    }
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json

@@ -7,19 +7,7 @@
   "ingredients": [
     {
       "type": "appliedenergistics2:part",
-      "part": "cable_covered.fluix"
-    },
-    {
-      "type": "appliedenergistics2:part",
-      "part": "cable_covered.fluix"
-    },
-    {
-      "type": "appliedenergistics2:part",
-      "part": "cable_covered.fluix"
-    },
-    {
-      "type": "appliedenergistics2:part",
-      "part": "cable_covered.fluix"
+      "part": "cable_dense_covered.fluix"
     },
     {
       "type": "forge:ore_dict",