From 47cde5abb2f6f11fe764981e93d8553f198ad350 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Fri, 13 Sep 2019 20:07:27 +0200
Subject: [PATCH] The Funnel looked too Funny

- Improved the model of Belt Funnel and Pulley
- Added a null check to ServerSchematicLoader ticks. Possibly helps #7
---
 src/main/java/com/simibubi/create/Create.java |   4 +-
 .../logistics/block/BeltFunnelBlock.java      |   8 +-
 .../create/models/block/belt_funnel.json      |  94 +++++++-------
 .../create/models/block/belt_pulley.json      |   6 +-
 .../create/models/item/belt_funnel.json       | 120 +++++++++---------
 .../assets/create/models/item/extractor.json  |  14 +-
 .../create/models/item/linked_extractor.json  |  14 +-
 .../create/textures/block/belt_funnel.png     | Bin 490 -> 418 bytes
 .../assets/create/textures/item/symbols.png   | Bin 288 -> 0 bytes
 9 files changed, 121 insertions(+), 139 deletions(-)
 delete mode 100644 src/main/resources/assets/create/textures/item/symbols.png

diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java
index aabfb8089..69fcfb0c4 100644
--- a/src/main/java/com/simibubi/create/Create.java
+++ b/src/main/java/com/simibubi/create/Create.java
@@ -28,7 +28,7 @@ public class Create {
 
 	public static final String ID = "create";
 	public static final String NAME = "Create";
-	public static final String VERSION = "0.0.5";
+	public static final String VERSION = "0.1.0";
 
 	public static Logger logger = LogManager.getLogger();
 	public static ItemGroup creativeTab = new CreateItemGroup();
@@ -77,6 +77,8 @@ public class Create {
 	}
 
 	public static void tick() {
+		if (schematicReceiver == null)
+			schematicReceiver = new ServerSchematicLoader();
 		schematicReceiver.tick();
 	}
 
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java
index 004383143..b591fad53 100644
--- a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java
@@ -35,9 +35,11 @@ import net.minecraft.world.World;
 
 public class BeltFunnelBlock extends HorizontalBlock implements IBeltAttachment, IWithTileEntity<BeltFunnelTileEntity> {
 
-	public static final VoxelShape SHAPE_NORTH = makeCuboidShape(4, 2, -1, 12, 10, 5),
-			SHAPE_SOUTH = makeCuboidShape(4, 2, 11, 12, 10, 17), SHAPE_WEST = makeCuboidShape(-1, 2, 4, 5, 10, 12),
-			SHAPE_EAST = makeCuboidShape(11, 2, 4, 17, 10, 12);
+	public static final VoxelShape 
+			SHAPE_NORTH = makeCuboidShape(3, -4, -1, 13, 8, 5),
+			SHAPE_SOUTH = makeCuboidShape(3, -4, 11, 13, 8, 17), 
+			SHAPE_WEST = makeCuboidShape(-1, -4, 3, 5, 8, 13),
+			SHAPE_EAST = makeCuboidShape(11, -4, 3, 17, 8, 13);
 
 	public BeltFunnelBlock() {
 		super(Properties.from(Blocks.ANDESITE));
diff --git a/src/main/resources/assets/create/models/block/belt_funnel.json b/src/main/resources/assets/create/models/block/belt_funnel.json
index 10bd2f156..8ba5f3c81 100644
--- a/src/main/resources/assets/create/models/block/belt_funnel.json
+++ b/src/main/resources/assets/create/models/block/belt_funnel.json
@@ -1,23 +1,22 @@
 {
     "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
-	"parent": "block/block",
     "textures": {
+        "particle": "create:block/belt_funnel",
         "belt_funnel": "create:block/belt_funnel",
-        "belt": "create:block/belt",
-		"particle": "create:block/belt_funnel"
+        "brass_casing": "create:block/brass_casing"
     },
     "elements": [
         {
             "name": "Bottom",
-            "from": [ 3, 0, -1 ], 
-            "to": [ 13, 1, 5 ], 
+            "from": [ 3, -4.1, -1 ], 
+            "to": [ 13, -3.1, 5 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] },
-                "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }
+                "north": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ] },
+                "south": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 },
+                "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 }
             }
         },
         {
@@ -26,44 +25,33 @@
             "to": [ 13, 8, 5 ], 
             "faces": {
                 "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ] },
                 "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] },
-                "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 },
+                "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 }
             }
         },
         {
             "name": "Side",
-            "from": [ 3, 1, -1 ], 
+            "from": [ 3, -3.1, -1 ], 
             "to": [ 4, 7, 5 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
-            }
-        },
-        {
-            "name": "Side",
-            "from": [ 12, 1, -1 ], 
-            "to": [ 13, 7, 5 ], 
-            "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
+                "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] },
+                "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }
             }
         },
         {
             "name": "Center",
-            "from": [ 4, 1, -1 ], 
+            "from": [ 4, -3.1, -1 ], 
             "to": [ 12, 7, 4 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 14 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
+                "north": { "texture": "#brass_casing", "uv": [ 4, 3, 12, 13.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 9, 3, 10, 9 ], "rotation": 90 },
+                "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 0, 2, 1, 8 ], "rotation": 90 }
             }
         },
         {
@@ -73,24 +61,34 @@
             "rotation": { "origin": [ 8, 8, 0 ], "axis": "x", "angle": -22.5 },
             "faces": {
                 "north": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ], "rotation": 180 },
-                "east": { "texture": "#belt_funnel", "uv": [ 0, 9.6, 1.8, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 2, 12.4 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.4 ], "rotation": 180 },
+                "east": { "texture": "#belt_funnel", "uv": [ 11, 4.6, 16, 6.6 ], "rotation": 180 },
+                "south": { "texture": "#belt_funnel", "uv": [ 9, 2, 11, 10 ], "rotation": 90 },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 5, 15, 7.4 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 11, 2, 16, 9.4 ], "rotation": 90 },
                 "down": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.8 ] }
             }
         },
         {
             "name": "Ramp",
-            "from": [ 4, -0.9, 4 ], 
-            "to": [ 12, 1.1, 11 ], 
-            "rotation": { "origin": [ 8, 1, 5 ], "axis": "x", "angle": 45.0 },
+            "from": [ 4, -4, -8 ], 
+            "to": [ 12, 3, -1 ], 
+            "rotation": { "origin": [ 8, -4, -1 ], "axis": "x", "angle": 45.0 },
             "faces": {
-                "north": { "texture": "#belt", "uv": [ 0, 0, 8, 2 ] },
-                "east": { "texture": "#belt", "uv": [ 14, 3, 16, 10 ], "rotation": 90 },
-                "west": { "texture": "#belt", "uv": [ 0, 3, 2, 10 ], "rotation": 270 },
-                "up": { "texture": "#belt", "uv": [ 4, 1, 12, 8 ] },
-                "down": { "texture": "#belt", "uv": [ 0, 0, 8, 7 ] }
+                "north": { "texture": "#brass_casing", "uv": [ 4, 5, 12, 12 ] },
+                "east": { "texture": "#brass_casing", "uv": [ 4, 9, 11, 16 ], "rotation": 90 },
+                "west": { "texture": "#brass_casing", "uv": [ 5, 9, 12, 16 ], "rotation": 270 },
+                "down": { "texture": "#brass_casing", "uv": [ 4, 0, 12, 7 ] }
+            }
+        },
+        {
+            "name": "Side",
+            "from": [ 12, -3.1, -1 ], 
+            "to": [ 13, 7, 5 ], 
+            "faces": {
+                "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ], "rotation": 180 },
+                "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }
             }
         }
     ]
diff --git a/src/main/resources/assets/create/models/block/belt_pulley.json b/src/main/resources/assets/create/models/block/belt_pulley.json
index 23dde8be4..6aa444674 100644
--- a/src/main/resources/assets/create/models/block/belt_pulley.json
+++ b/src/main/resources/assets/create/models/block/belt_pulley.json
@@ -2,11 +2,11 @@
     "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
 	"parent": "block/cube",
     "textures": {
-        "particle": "block/stripped_spruce_log",
+        "particle": "block/dark_oak_log",
         "0": "create:block/axis",
         "1": "create:block/axis_top",
-        "2": "block/stripped_spruce_log",
-        "3": "block/stripped_spruce_log_top"
+        "2": "block/dark_oak_log",
+        "3": "block/dark_oak_log"
     },
     "elements": [
         {
diff --git a/src/main/resources/assets/create/models/item/belt_funnel.json b/src/main/resources/assets/create/models/item/belt_funnel.json
index 9a9b66c76..12c0bd838 100644
--- a/src/main/resources/assets/create/models/item/belt_funnel.json
+++ b/src/main/resources/assets/create/models/item/belt_funnel.json
@@ -1,45 +1,49 @@
 {
     "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
-	"parent": "block/block",
-	"display": {
+    "textures": {
+        "particle": "create:block/belt_funnel",
+        "belt_funnel": "create:block/belt_funnel",
+        "brass_casing": "create:block/brass_casing"
+    },
+    "display": {
         "gui": {
             "rotation": [ 30, 45, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.625, 0.625, 0.625 ]
+            "translation": [ 2, 2, 0 ],
+            "scale": [ 0.625, 0.625, 0.625 ]
+        },
+        "ground": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 3, 2 ],
+            "scale": [ 0.25, 0.25, 0.25 ]
         },
         "fixed": {
             "rotation": [ 0, 180, 0 ],
-            "translation": [ 0, 0, -3.5],
-            "scale":[ 0.5, 0.5, 0.5 ]
+            "translation": [ 0, 3, -2.75 ],
+            "scale": [ 0.5, 0.5, 0.5 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ 0, 2.5, 0 ],
+            "scale": [ 0.4, 0.4, 0.4 ]
+        },
+        "thirdperson_righthand": {
+            "rotation": [ 75, 45, 0 ],
+            "translation": [ 0, 2.5, 0 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
         }
     },
-    "textures": {
-        "belt_funnel": "create:block/belt_funnel",
-		"symbols": "create:item/symbols"
-    },
     "elements": [
-		{
-            "name": "Indicator",
-            "from": [ 8, 7, 13 ], 
-            "to": [ 16, 15, 13 ], 
-            "shade": false,
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 },
-            "faces": {
-                "north": { "texture": "#symbols", "uv": [ 0, 8, 8, 16 ] },
-                "south": { "texture": "#symbols", "uv": [ 0, 8, 8, 16 ] }
-            }
-        },
         {
             "name": "Bottom",
-            "from": [ 3, 0, -1 ], 
-            "to": [ 13, 1, 5 ], 
+            "from": [ 3, -4.1, -1 ], 
+            "to": [ 13, -3.1, 5 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] },
-                "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }
+                "north": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ] },
+                "south": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 },
+                "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 }
             }
         },
         {
@@ -48,44 +52,33 @@
             "to": [ 13, 8, 5 ], 
             "faces": {
                 "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ] },
                 "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] },
-                "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 },
+                "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 }
             }
         },
         {
             "name": "Side",
-            "from": [ 3, 1, -1 ], 
+            "from": [ 3, -3.1, -1 ], 
             "to": [ 4, 7, 5 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
-            }
-        },
-        {
-            "name": "Side",
-            "from": [ 12, 1, -1 ], 
-            "to": [ 13, 7, 5 ], 
-            "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
+                "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] },
+                "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }
             }
         },
         {
             "name": "Center",
-            "from": [ 4, 1, -1 ], 
+            "from": [ 4, -3.1, -1 ], 
             "to": [ 12, 7, 4 ], 
             "faces": {
-                "north": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 14 ] },
-                "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 7 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }
+                "north": { "texture": "#brass_casing", "uv": [ 4, 3, 12, 13.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 9, 3, 10, 9 ], "rotation": 90 },
+                "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 0, 2, 1, 8 ], "rotation": 90 }
             }
         },
         {
@@ -95,12 +88,23 @@
             "rotation": { "origin": [ 8, 8, 0 ], "axis": "x", "angle": -22.5 },
             "faces": {
                 "north": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ], "rotation": 180 },
-                "east": { "texture": "#belt_funnel", "uv": [ 0, 9.6, 1.8, 14 ], "rotation": 90 },
-                "south": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ] },
-                "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 2, 12.4 ], "rotation": 90 },
-                "up": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.4 ], "rotation": 180 },
+                "east": { "texture": "#belt_funnel", "uv": [ 11, 4.6, 16, 6.6 ], "rotation": 180 },
+                "south": { "texture": "#belt_funnel", "uv": [ 9, 2, 11, 10 ], "rotation": 90 },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 5, 15, 7.4 ], "rotation": 180 },
+                "up": { "texture": "#belt_funnel", "uv": [ 11, 2, 16, 9.4 ], "rotation": 90 },
                 "down": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.8 ] }
             }
+        },
+        {
+            "name": "Side",
+            "from": [ 12, -3.1, -1 ], 
+            "to": [ 13, 7, 5 ], 
+            "faces": {
+                "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] },
+                "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ], "rotation": 180 },
+                "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] },
+                "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/item/extractor.json b/src/main/resources/assets/create/models/item/extractor.json
index ff105c6db..4738b69ac 100644
--- a/src/main/resources/assets/create/models/item/extractor.json
+++ b/src/main/resources/assets/create/models/item/extractor.json
@@ -13,22 +13,10 @@
         }
     },
 	"textures": {
-        "extractor": "create:block/extractor",
-		"symbols": "create:item/symbols"
+        "extractor": "create:block/extractor"
     },
 	"elements": [
 		{
-            "name": "Indicator",
-            "from": [ 8, 7, 13 ], 
-            "to": [ 16, 15, 13 ], 
-            "shade": false,
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 },
-            "faces": {
-                "north": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] },
-                "south": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] }
-            }
-        },
-		{
             "name": "Bottom",
             "from": [ 4, 2, -1 ], 
             "to": [ 12, 3, 5 ], 
diff --git a/src/main/resources/assets/create/models/item/linked_extractor.json b/src/main/resources/assets/create/models/item/linked_extractor.json
index 23049b3ea..119fdddc3 100644
--- a/src/main/resources/assets/create/models/item/linked_extractor.json
+++ b/src/main/resources/assets/create/models/item/linked_extractor.json
@@ -14,22 +14,10 @@
     },
 	"textures": {
 		"redstone_antenna": "create:block/redstone_antenna",
-        "extractor": "create:block/extractor",
-		"symbols": "create:item/symbols"
+        "extractor": "create:block/extractor"
     },
 	"elements": [
 		{
-            "name": "Indicator",
-            "from": [ 8, 7, 13 ], 
-            "to": [ 16, 15, 13 ], 
-            "shade": false,
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 },
-            "faces": {
-                "north": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] },
-                "south": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] }
-            }
-        },
-		{
             "name": "Bottom",
             "from": [ 4, 2, -1 ], 
             "to": [ 12, 3, 5 ], 
diff --git a/src/main/resources/assets/create/textures/block/belt_funnel.png b/src/main/resources/assets/create/textures/block/belt_funnel.png
index 0e505629cbf2dba4f121fc3daae17d21b9aca917..ad263e88c68fe2a98280fc66cd0ab900d8e3c000 100644
GIT binary patch
delta 354
zcmV-o0iFKp1EK?vNq@os01m<d6(~x80003uNkl<ZI8Vh=T}lHn5dJbrn$<4;?1JJI
zMDW2g_~41e6Zp~#cmPi#6rVhR7buFm)ygjW(<Dw(@j<Yy6!e23nJ<&cmzfdQmlwWj
zXE@3aL3$gmufJA7gy(62x_U)fmbe?2FvdV@4dS!Y69v`U27foVj~sB1EX!ix_jPo2
z4%b=isuvjLpxFS2y)*|M?C0z(ha3!%BtvYGhY=p+EfV1(N8UN4X}Z*i1RxaJ-obkh
zDcBESj>3OeK}oqt!mykmSZ7%Ya}<iT3Uh1WoR9nPda!{Mk^4IZlG|o9Mc+u?D~jCO
z3Ih0HXuj+r&|BKjO01_KpzRv;+_BJwjup-OK5{fEo<2i<#`LYgdo_y*=3KbCu~0mX
zf&0}cKa3}Flm%2we0;V85hQJbMOin%e<uJw0OdxkwB}aTOaK4?07*qoM6N<$g8oUM
AumAu6

delta 427
zcmV;c0aX5?1L^~iNq@rt01m?e$8V@)0004hNkl<ZI8UXL%SyvQ6o&tqNhVDb3vHp*
zg}4_%&}VSr6ZitYgZKn)d;xJS_#Q%W<yu^co1)lDN>h?H$#_muub5it4<9pg=5pp-
z#M#NA3F8qqnr%qCiflId7=@I08T2p-hv@hFxakbwI1X&vhJU2J-5muhP9t1gJ<x$$
zG#ZWk;Lq{=^Z>R|Xz5otI;96BfE4ZeI%KQfq{U(>?Lk;Bv=Wd4IXq{ZG+74U_ZK4R
z1`|dJrb&vJ7{|%nPVxRFOHr&u)lqP58VOGqHp$6aR!LSco5Pab-g7Zqph3{XXgoxm
zrnEAk@N=>4Uw>u1>vZ!nDrF&~x3>3d5XVPbrt11w^J-M03XCyGDY02*$XS9Y3Nai9
zxV(Ox`~5Dlx2cVyY}(|F5yBvvW^kz1LI_OAQ;;a!KLx)&Ao)waTY*RLyu!HDZMuMM
zOqnFdqis#yrD0KveuZ21oia&IMoJ~2h(ARO&NO!%MI@Q`eVJBIB41cV<$qgBz#9pc
Vv1(e__8|ZO002ovPDHLkV1l9v#eM()

diff --git a/src/main/resources/assets/create/textures/item/symbols.png b/src/main/resources/assets/create/textures/item/symbols.png
deleted file mode 100644
index 37722a2e96811def2642dcec5454b466e7353ae8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!L6Pyjv*HQ$$$R;w`W#XR%YgCxUqyuO@sH^
zo`*(<|M%Q_sWOwvtU+dWBEvhTBF3X^4a|a1$~ENq%GS&}XRz2(SZG%T!wpu(T|63G
zomY9-6vPjF_~rfo|MKfT%tnGqEe4a<tkGfSVc!#b^1<0^=5y?cP7HD#{o>yn4j;UJ
zrYkWjPvGK5E;EK@l58G^ErD)sY^Pczw*0(e*tX{6>j#WKetb;U;I@|d(c-d^Q6sT|
f_W?gM8yiFV&m7}f7tiMaJ;31U>gTe~DWM4fjJIWV