Merge pull request #4483 from AppliedEnergistics/texture-cleanup

Texture Cleanup

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -41,9 +41,9 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
     private static final Material TEXTURE_RING_LIGHT_CORNER = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
             new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light_corner"));
     private static final Material TEXTURE_CABLE_GLASS = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
-            new ResourceLocation(AppEng.MOD_ID, "parts/cable/glass/transparent"));
+            new ResourceLocation(AppEng.MOD_ID, "part/cable/glass/transparent"));
     private static final Material TEXTURE_COVERED_CABLE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
-            new ResourceLocation(AppEng.MOD_ID, "parts/cable/covered/transparent"));
+            new ResourceLocation(AppEng.MOD_ID, "part/cable/covered/transparent"));
 
     private static final float DEFAULT_RENDER_MIN = 2.0f;
     private static final float DEFAULT_RENDER_MAX = 14.0f;

src/main/java/appeng/client/render/cablebus/CableBuilder.java

@@ -81,19 +81,19 @@ class CableBuilder {
         String textureFolder;
         switch (cableType) {
             case GLASS:
-                textureFolder = "parts/cable/glass/";
+                textureFolder = "part/cable/glass/";
                 break;
             case COVERED:
-                textureFolder = "parts/cable/covered/";
+                textureFolder = "part/cable/covered/";
                 break;
             case SMART:
-                textureFolder = "parts/cable/smart/";
+                textureFolder = "part/cable/smart/";
                 break;
             case DENSE_COVERED:
-                textureFolder = "parts/cable/dense_covered/";
+                textureFolder = "part/cable/dense_covered/";
                 break;
             case DENSE_SMART:
-                textureFolder = "parts/cable/dense_smart/";
+                textureFolder = "part/cable/dense_smart/";
                 break;
             default:
                 throw new IllegalStateException("Cable type " + cableType + " does not support connections.");

src/main/java/appeng/client/render/cablebus/CableCoreType.java

@@ -37,7 +37,7 @@ import appeng.core.AppEng;
  * Covered (also used by the Smart Cable) - Dense
  */
 public enum CableCoreType {
-    GLASS("parts/cable/core/glass"), COVERED("parts/cable/core/covered"), DENSE("parts/cable/core/dense_smart");
+    GLASS("part/cable/core/glass"), COVERED("part/cable/core/covered"), DENSE("part/cable/core/dense_smart");
 
     private static final Map<AECableType, CableCoreType> cableMapping = generateCableMapping();
 

src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java

@@ -23,7 +23,7 @@ import appeng.core.AppEng;
 
 public class P2PTunnelFrequencyModel implements IModelGeometry<P2PTunnelFrequencyModel> {
     private static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
-            new ResourceLocation(AppEng.MOD_ID, "parts/p2p_tunnel_frequency"));
+            new ResourceLocation(AppEng.MOD_ID, "part/p2p_tunnel_frequency"));
 
     @Override
     public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery,

src/main/java/appeng/client/render/cablebus/SmartCableTextures.java

@@ -34,16 +34,16 @@ import appeng.core.AppEng;
 public class SmartCableTextures {
 
     public static final Material[] SMART_CHANNELS_TEXTURES = Arrays
-            .stream(new ResourceLocation[] { new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_00"), //
+            .stream(new ResourceLocation[] { new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_00"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_01"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_01"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_02"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_02"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_03"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_03"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_04"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_04"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_10"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_10"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_11"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_11"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_12"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_12"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_13"), //
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_13"), //
-                    new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_14")//
+                    new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_14")//
             }).map(e -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, e)).toArray(Material[]::new);
 
     // Textures used to display channels on smart cables. There's two sets of 5

src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json

@@ -4,8 +4,8 @@
     "particle": "appliedenergistics2:block/wireless_access_point_inside",
     "inside": "appliedenergistics2:block/wireless_access_point_inside",
     "1": "appliedenergistics2:block/wireless_access_point",
-    "sides": "appliedenergistics2:parts/monitor_sides",
+    "sides": "appliedenergistics2:part/monitor_sides",
-    "sidesStatus": "appliedenergistics2:parts/monitor_sides_status"
+    "sidesStatus": "appliedenergistics2:part/monitor_sides_status"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json

@@ -1,6 +1,6 @@
 {
   "textures": {
-    "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
+    "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json

@@ -1,6 +1,6 @@
 {
   "textures": {
-    "indicator": "appliedenergistics2:parts/monitor_sides_status_off"
+    "indicator": "appliedenergistics2:part/monitor_sides_status_off"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json

@@ -1,6 +1,6 @@
 {
   "textures": {
-    "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
+    "indicator": "appliedenergistics2:part/monitor_sides_status_on"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json

@@ -1,8 +1,8 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/plane_sides",
+    "sides": "appliedenergistics2:part/plane_sides",
-    "plane": "appliedenergistics2:item/part/annihilation_plane"
+    "plane": "appliedenergistics2:part/annihilation_plane"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json

@@ -1,8 +1,8 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "all": "appliedenergistics2:parts/cable_anchor",
+    "all": "appliedenergistics2:part/cable_anchor",
-    "particle": "appliedenergistics2:parts/cable_anchor"
+    "particle": "appliedenergistics2:part/cable_anchor"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json

@@ -1,82 +1,8 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/cable_interface",
   "textures": {
-    "sides": "appliedenergistics2:parts/monitor_sides",
+    "sides": "appliedenergistics2:part/monitor_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/fluid_interface"
+    "front": "appliedenergistics2:part/fluid_interface"
-  },
+  }
-  "elements": [
-    {
-      "from": [2, 2, 7],
-      "to": [14, 14, 9],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [5, 5, 10],
-      "to": [11, 11, 11],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [5, 5, 9],
-      "to": [11, 11, 10],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/monitor_sides",
+    "sides": "appliedenergistics2:part/monitor_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/interface"
+    "front": "appliedenergistics2:part/interface"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/conversion_monitor",
+    "front": "appliedenergistics2:part/conversion_monitor",
-    "front_bright": "appliedenergistics2:parts/conversion_monitor_bright",
+    "front_bright": "appliedenergistics2:part/conversion_monitor_bright",
-    "front_medium": "appliedenergistics2:parts/conversion_monitor_medium",
+    "front_medium": "appliedenergistics2:part/conversion_monitor_medium",
-    "front_dark": "appliedenergistics2:parts/conversion_monitor_dark"
+    "front_dark": "appliedenergistics2:part/conversion_monitor_dark"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/crafting_terminal",
+    "front": "appliedenergistics2:part/crafting_terminal",
-    "front_bright": "appliedenergistics2:parts/crafting_terminal_bright",
+    "front_bright": "appliedenergistics2:part/crafting_terminal_bright",
-    "front_medium": "appliedenergistics2:parts/crafting_terminal_medium",
+    "front_medium": "appliedenergistics2:part/crafting_terminal_medium",
-    "front_dark": "appliedenergistics2:parts/crafting_terminal_dark"
+    "front_dark": "appliedenergistics2:part/crafting_terminal_dark"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:parts/monitor_front",
+    "front": "appliedenergistics2:part/monitor_front",
-    "front_bright": "appliedenergistics2:parts/monitor_colored",
+    "front_bright": "appliedenergistics2:part/monitor_colored",
-    "front_medium": "appliedenergistics2:parts/monitor_bright",
+    "front_medium": "appliedenergistics2:part/monitor_bright",
-    "front_dark": "appliedenergistics2:parts/monitor_colored"
+    "front_dark": "appliedenergistics2:part/monitor_colored"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/display_base.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/monitor_sides",
+    "sides": "appliedenergistics2:part/monitor_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front_medium_bright": "appliedenergistics2:parts/monitor_colored"
+    "front_medium_bright": "appliedenergistics2:part/monitor_colored"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/export_bus.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/export_bus_sides",
+    "sides": "appliedenergistics2:part/export_bus_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/export_bus"
+    "front": "appliedenergistics2:part/export_bus"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/facade_base.json

@@ -1,8 +1,8 @@
 {
   "parent": "block/block",
   "textures": {
-    "anchor": "appliedenergistics2:parts/cable_anchor",
+    "anchor": "appliedenergistics2:part/cable_anchor",
-    "particle": "appliedenergistics2:parts/cable_anchor"
+    "particle": "appliedenergistics2:part/cable_anchor"
   },
   "display": {
     "gui": {

src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json

@@ -1,56 +1,7 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/annihilation_plane",
   "textures": {
-    "sides": "appliedenergistics2:parts/plane_sides",
+    "sides": "appliedenergistics2:part/plane_sides",
-    "plane": "appliedenergistics2:item/part/fluid_annihilation_plane"
+    "plane": "appliedenergistics2:part/fluid_annihilation_plane"
-  },
+  }
-  "elements": [
-    {
-      "name": "Front",
-      "from": [1, 1, 8],
-      "to": [15, 15, 9],
-      "faces": {
-        "north": {
-          "texture": "plane"
-        },
-        "south": {
-          "texture": "sides"
-        },
-        "east": {
-          "texture": "sides"
-        },
-        "west": {
-          "texture": "sides"
-        },
-        "up": {
-          "texture": "sides"
-        },
-        "down": {
-          "texture": "sides"
-        }
-      }
-    },
-    {
-      "name": "Back",
-      "from": [5, 5, 9],
-      "to": [11, 11, 10],
-      "faces": {
-        "east": {
-          "texture": "sides"
-        },
-        "south": {
-          "texture": "sides"
-        },
-        "west": {
-          "texture": "sides"
-        },
-        "up": {
-          "texture": "sides"
-        },
-        "down": {
-          "texture": "sides"
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json

@@ -1,82 +1,8 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/export_bus",
   "textures": {
-    "sides": "appliedenergistics2:parts/export_bus_sides",
+    "sides": "appliedenergistics2:part/export_bus_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/fluid_export_bus"
+    "front": "appliedenergistics2:part/fluid_export_bus"
-  },
+  }
-  "elements": [
-    {
-      "from": [4, 4, 8],
-      "to": [12, 12, 10],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [5, 5, 7],
-      "to": [11, 11, 8],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [6, 6, 6],
-      "to": [10, 10, 7],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/annihilation_plane",
   "textures": {
-    "plane": "appliedenergistics2:item/part/fluid_formation_plane"
+    "plane": "appliedenergistics2:part/fluid_formation_plane"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json

@@ -1,82 +1,8 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/import_bus",
   "textures": {
-    "sides": "appliedenergistics2:parts/import_bus_sides",
+    "sides": "appliedenergistics2:part/import_bus_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/fluid_import_bus"
+    "front": "appliedenergistics2:part/fluid_import_bus"
-  },
+  }
-  "elements": [
-    {
-      "from": [3, 3, 8],
-      "to": [13, 13, 9],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [4, 4, 9],
-      "to": [12, 12, 10],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [5, 5, 10],
-      "to": [11, 11, 11],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json

@@ -1,38 +1,3 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/level_emitter"
-  "textures": {
-    "emitter": "appliedenergistics2:item/part/level_emitter_off"
-  },
-  "elements": [
-    {
-      "from": [7, 6, 7],
-      "to": [9, 10, 9],
-      "faces": {
-        "north": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "south": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "east": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "west": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "up": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 9]
-        },
-        "down": {
-          "texture": "#emitter",
-          "uv": [7, 9, 9, 11]
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json

@@ -1,82 +1,8 @@
 {
-  "parent": "appliedenergistics2:item/part_base",
+  "parent": "appliedenergistics2:item/storage_bus",
   "textures": {
-    "sides": "appliedenergistics2:parts/storage_bus_sides",
+    "sides": "appliedenergistics2:part/storage_bus_sides",
-    "back": "appliedenergistics2:parts/storage_bus_back",
+    "back": "appliedenergistics2:part/storage_bus_back",
-    "front": "appliedenergistics2:item/part/fluid_storage_bus"
+    "front": "appliedenergistics2:part/fluid_storage_bus"
-  },
+  }
-  "elements": [
-    {
-      "from": [3, 3, 6],
-      "to": [13, 13, 7],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [2, 2, 7],
-      "to": [14, 14, 8],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    },
-    {
-      "from": [5, 5, 8],
-      "to": [11, 11, 10],
-      "faces": {
-        "north": {
-          "texture": "#front"
-        },
-        "south": {
-          "texture": "#back"
-        },
-        "east": {
-          "texture": "#sides"
-        },
-        "west": {
-          "texture": "#sides"
-        },
-        "up": {
-          "texture": "#sides"
-        },
-        "down": {
-          "texture": "#sides"
-        }
-      }
-    }
-  ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/crafting_terminal",
+    "front": "appliedenergistics2:part/crafting_terminal",
-    "front_bright": "appliedenergistics2:parts/fluid_terminal/lights_bright",
+    "front_bright": "appliedenergistics2:part/fluid_terminal_bright",
-    "front_medium": "appliedenergistics2:parts/fluid_terminal/lights_medium",
+    "front_medium": "appliedenergistics2:part/fluid_terminal_medium",
-    "front_dark": "appliedenergistics2:parts/fluid_terminal/lights_dark"
+    "front_dark": "appliedenergistics2:part/fluid_terminal_dark"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/annihilation_plane",
   "textures": {
-    "plane": "appliedenergistics2:item/part/formation_plane"
+    "plane": "appliedenergistics2:part/formation_plane"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/annihilation_plane",
   "textures": {
-    "plane": "appliedenergistics2:item/part/identity_annihilation_plane"
+    "plane": "appliedenergistics2:part/identity_annihilation_plane"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/import_bus.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/import_bus_sides",
+    "sides": "appliedenergistics2:part/import_bus_sides",
-    "back": "appliedenergistics2:parts/monitor_back",
+    "back": "appliedenergistics2:part/monitor_back",
-    "front": "appliedenergistics2:item/part/import_bus"
+    "front": "appliedenergistics2:part/import_bus"
   },
   "elements": [
     {

src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/interface_terminal",
+    "front": "appliedenergistics2:part/interface_terminal",
-    "front_bright": "appliedenergistics2:parts/interface_terminal_bright",
+    "front_bright": "appliedenergistics2:part/interface_terminal_bright",
-    "front_medium": "appliedenergistics2:parts/interface_terminal_medium",
+    "front_medium": "appliedenergistics2:part/interface_terminal_medium",
-    "front_dark": "appliedenergistics2:parts/interface_terminal_dark"
+    "front_dark": "appliedenergistics2:part/interface_terminal_dark"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/toggle_bus",
   "textures": {
-    "bus": "appliedenergistics2:item/part/inverted_toggle_bus"
+    "bus": "appliedenergistics2:part/inverted_toggle_bus"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json

@@ -1,37 +1,19 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "emitter": "appliedenergistics2:item/part/level_emitter_off"
+    "emitter": "appliedenergistics2:part/level_emitter_off"
   },
   "elements": [
     {
       "from": [7, 6, 7],
       "to": [9, 10, 9],
       "faces": {
-        "north": {
+        "north": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" },
-          "texture": "#emitter",
+        "east": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" },
-          "uv": [7, 7, 9, 11]
+        "south": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" },
-        },
+        "west": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" },
-        "south": {
+        "up": { "uv": [6, 7, 8, 9], "texture": "#emitter" },
-          "texture": "#emitter",
+        "down": { "uv": [8, 7, 10, 9], "texture": "#emitter" }
-          "uv": [7, 7, 9, 11]
-        },
-        "east": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "west": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 11]
-        },
-        "up": {
-          "texture": "#emitter",
-          "uv": [7, 7, 9, 9]
-        },
-        "down": {
-          "texture": "#emitter",
-          "uv": [7, 9, 9, 11]
-        }
       }
     }
   ]

src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/monitor.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/crafting_terminal",
+    "front": "appliedenergistics2:part/crafting_terminal",
-    "front_bright": "appliedenergistics2:parts/monitor_bright",
+    "front_bright": "appliedenergistics2:part/monitor_bright",
-    "front_medium": "appliedenergistics2:parts/monitor_colored",
+    "front_medium": "appliedenergistics2:part/monitor_colored",
-    "front_dark": "appliedenergistics2:parts/monitor_colored"
+    "front_dark": "appliedenergistics2:part/monitor_colored"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/part_base",
   "textures": {
-    "sides": "appliedenergistics2:parts/p2p_tunnel_sides",
+    "sides": "appliedenergistics2:part/p2p_tunnel_sides",
-    "back": "appliedenergistics2:item/part/p2p_tunnel_back",
+    "back": "appliedenergistics2:part/p2p_tunnel_back",
-    "front": "appliedenergistics2:item/part/p2p_tunnel_front",
+    "front": "appliedenergistics2:part/p2p_tunnel_front",
     "type": "appliedenergistics2:block/quartz_block"
   },
   "elements": [

src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json

@@ -1,9 +1,9 @@
 {
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
-    "front": "appliedenergistics2:item/part/pattern_terminal",
+    "front": "appliedenergistics2:part/pattern_terminal",
-    "front_bright": "appliedenergistics2:parts/pattern_terminal_bright",
+    "front_bright": "appliedenergistics2:part/pattern_terminal_bright",
-    "front_medium": "appliedenergistics2:parts/pattern_terminal_medium",
+    "front_medium": "appliedenergistics2:part/pattern_terminal_medium",
-    "front_dark": "appliedenergistics2:parts/pattern_terminal_dark"
+    "front_dark": "appliedenergistics2:part/pattern_terminal_dark"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json

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

src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json

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