Make pipe color order match vanilla dye order

Author: WhitePhant0m

src/main/java/aztech/modern_industrialization/compat/ae2/MIAEAddon.java

@@ -116,7 +116,7 @@ private static void registerMEPipeType(PipeColor color) {
                 pipeId,
                 prop -> new PipeItem(prop, type, new MENetworkData()),
                 MIPipes.ITEM_MODEL_GENERATOR,
-                SortOrder.PIPES);
+                SortOrder.PIPES.and(color.ordinal()));
         MIPipes.INSTANCE.register(type, itemDef::asItem);
         TagsToGenerate.generateTag(MITags.ME_WIRES, itemDef, "ME Wires");
     }

src/main/java/aztech/modern_industrialization/pipes/MIPipes.java

@@ -117,7 +117,7 @@ private void registerFluidPipeType(PipeColor color) {
                 pipeId,
                 prop -> new PipeItem(prop, type, new FluidNetworkData(FluidVariant.blank())),
                 ITEM_MODEL_GENERATOR,
-                SortOrder.PIPES);
+                SortOrder.PIPES.and(color.ordinal()));
         register(type, itemDef::asItem);
         TagsToGenerate.generateTag(MITags.FLUID_PIPES, itemDef, "Fluid Pipes");
     }
@@ -130,7 +130,7 @@ private void registerItemPipeType(PipeColor color) {
                 pipeId,
                 prop -> new PipeItem(prop, type, new ItemNetworkData()),
                 ITEM_MODEL_GENERATOR,
-                SortOrder.PIPES);
+                SortOrder.PIPES.and(color.ordinal()));
         register(type, itemDef::asItem);
         TagsToGenerate.generateTag(MITags.ITEM_PIPES, itemDef, "Item Pipes");
     }

src/main/java/aztech/modern_industrialization/pipes/PipeColor.java

@@ -26,21 +26,21 @@
 public enum PipeColor {
     REGULAR(14599002),
     WHITE("White", "white", 16383998),
+    LIGHT_GRAY("Light Gray", "light_gray", 10329495),
+    GRAY("Gray", "gray", 4673362),
+    BLACK("Black", "black", 1908001),
+    BROWN("Brown", "brown", 8606770),
+    RED("Red", "red", 11546150),
     ORANGE("Orange", "orange", 16351261),
-    MAGENTA("Magenta", "magenta", 13061821),
-    LIGHT_BLUE("Light Blue", "light_blue", 3847130),
     YELLOW("Yellow", "yellow", 16701501),
     LIME("Lime", "lime", 8439583),
-    PINK("Pink", "pink", 15961002),
-    GRAY("Gray", "gray", 4673362),
-    LIGHT_GRAY("Light Gray", "light_gray", 10329495),
+    GREEN("Green", "green", 6192150),
     CYAN("Cyan", "cyan", 1481884),
-    PURPLE("Purple", "purple", 8991416),
+    LIGHT_BLUE("Light Blue", "light_blue", 3847130),
     BLUE("Blue", "blue", 3949738),
-    BROWN("Brown", "brown", 8606770),
-    GREEN("Green", "green", 6192150),
-    RED("Red", "red", 11546150),
-    BLACK("Black", "black", 1908001);
+    PURPLE("Purple", "purple", 8991416),
+    MAGENTA("Magenta", "magenta", 13061821),
+    PINK("Pink", "pink", 15961002);
 
     public final int color;
     public final String englishName;