From 8fc94971751a65f36a29e9440fa8368debb4829c Mon Sep 17 00:00:00 2001
From: BootyToast <drbootytoast@gmail.com>
Date: Wed, 17 Aug 2016 08:34:14 -0400
Subject: [PATCH] Finished oil gen textures & model. Tweaked coal gen model.

---
 .../models/block/blockCoalGenerator.json      | 384 +++++++++++++++---
 .../models/block/blockOilGenerator.json       | 384 +++++++++++++++---
 .../textures/blocks/blockOilGenerator.png     | Bin 4027 -> 3959 bytes
 .../textures/blocks/blockOilGeneratorTop.png  | Bin 701 -> 4550 bytes
 .../blocks/blockOilGeneratorTop.png.mcmeta    |   6 +
 5 files changed, 676 insertions(+), 98 deletions(-)
 create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png.mcmeta

diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json b/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json
index 79bc8c2d4..8de6a6d34 100644
--- a/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json
+++ b/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json
@@ -1,36 +1,62 @@
 {
     "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
     "textures": {
-        "0": "actuallyadditions:blocks/blockCoalGenerator",
-        "1": "actuallyadditions:blocks/blockCoalGeneratorSide",
-        "2": "actuallyadditions:blocks/blockCoalGeneratorTop",
-        "3": "actuallyadditions:blocks/blockCoalGeneratorBottom"
+        "0": "actuallyadditions:blocks/blockCoalGeneratorTop",
+        "1": "actuallyadditions:blocks/blockCoalGenerator",
+        "2": "actuallyadditions:blocks/blockCoalGeneratorBottom",
+        "3": "actuallyadditions:blocks/blockCoalGeneratorSide"
     },
     "elements": [
         {
             "name": "Cube",
-            "from": [ 1.0, 0.0, 1.0 ], 
-            "to": [ 15.0, 15.0, 15.0 ], 
+            "from": [ 15.0, 15.0, 1.0 ], 
+            "to": [ 16.0, 16.0, 15.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "east": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "cullface": "up" },
-                "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
             }
         },
         {
-            "name": "Outline",
-            "from": [ 0.0, 0.0, 0.0 ], 
-            "to": [ 1.0, 15.0, 1.0 ], 
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 15.0 ], 
+            "to": [ 16.0, 16.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 1.0 ], 
+            "to": [ 1.0, 16.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 0.0 ], 
+            "to": [ 16.0, 16.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
             }
         },
         {
@@ -38,25 +64,25 @@
             "from": [ 0.0, 0.0, 15.0 ], 
             "to": [ 1.0, 15.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
             "name": "Cube",
-            "from": [ 15.0, 0.0, 15.0 ], 
-            "to": [ 16.0, 15.0, 16.0 ], 
+            "from": [ 0.0, 0.0, 0.0 ], 
+            "to": [ 1.0, 15.0, 1.0 ], 
             "faces": {
-                "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
@@ -64,25 +90,285 @@
             "from": [ 15.0, 0.0, 0.0 ], 
             "to": [ 16.0, 15.0, 1.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
             "name": "Cube",
-            "from": [ 0.0, 15.0, 0.0 ], 
-            "to": [ 16.0, 16.0, 16.0 ], 
+            "from": [ 15.0, 0.0, 15.0 ], 
+            "to": [ 16.0, 15.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
-                "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 1.0, 1.0 ], 
+            "to": [ 15.0, 15.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
+                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.5, 0.0, 1.0 ], 
+            "to": [ 1.5, 15.5, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "east": { "texture": "#2", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "west": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 2.0, 15.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 2.0, 1.0, 16.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.5, 0.0, 1.0 ], 
+            "to": [ 15.5, 15.5, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "east": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "west": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "up": { "texture": "#0", "uv": [ 14.0, 1.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 14.5 ], 
+            "to": [ 15.0, 15.5, 15.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "south": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 14.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 13.0, 0.5 ], 
+            "to": [ 15.0, 15.5, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 0.5, 15.0, 3.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 2.5 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 0.0, 14.0, 2.5 ] },
+                "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 2.5 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 2.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 14.5, 1.5 ], 
+            "to": [ 14.5, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.5, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 2.5, 5.0, 15.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.5, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 10.0, 1.5, 14.5, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 10.0, 1.5, 14.5, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.5, 14.5, 1.5 ], 
+            "to": [ 6.0, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "east": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "west": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.5, 1.5, 6.0, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 1.5, 1.5, 6.0, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 14.5, 1.5 ], 
+            "to": [ 10.0, 15.5, 6.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 5.0, 10.0, 6.0 ] },
+                "east": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 5.0, 10.0, 6.0 ] },
+                "west": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 6.0, 1.5, 10.0, 6.0 ] },
+                "down": { "texture": "#0", "uv": [ 6.0, 1.5, 10.0, 6.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 14.5, 10.0 ], 
+            "to": [ 10.0, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 11.0 ] },
+                "east": { "texture": "#0", "uv": [ 6.0, 10.0, 10.5, 11.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 11.0 ] },
+                "west": { "texture": "#0", "uv": [ 6.0, 10.0, 10.5, 11.0 ] },
+                "up": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 6.5, 10.0, 10.5, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 0.5 ], 
+            "to": [ 15.0, 3.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 16.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 11.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 16.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 5.0, 3.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 15.0, 15.0, 16.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 4.0, 12.0, 0.5 ], 
+            "to": [ 6.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 3.0, 11.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 10.0, 3.0, 11.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 6.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 4.0, 0.5 ], 
+            "to": [ 15.0, 8.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 12.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 12.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 12.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 5.0, 3.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 15.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 12.0, 8.0, 0.5 ], 
+            "to": [ 15.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 8.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 3.0, 3.0, 4.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 8.0, 4.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 8.0, 0.5 ], 
+            "to": [ 4.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 12.0, 3.0, 15.0, 8.0 ] },
+                "east": { "texture": "#1", "uv": [ 12.0, 3.0, 13.0, 8.0 ] },
+                "south": { "texture": "#1", "uv": [ 12.0, 3.0, 15.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 3.0, 15.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 9.0, 3.0, 0.5 ], 
+            "to": [ 10.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 12.0, 3.0, 0.5 ], 
+            "to": [ 15.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 12.0, 4.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 3.0, 12.0, 4.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 12.0, 4.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 3.0, 12.0, 4.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 12.0, 0.5 ], 
+            "to": [ 12.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 6.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 3.0, 0.5 ], 
+            "to": [ 4.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 12.0, 12.0, 15.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 12.0, 12.0, 13.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 12.0, 12.0, 15.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 3.0, 15.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 3.0, 0.5 ], 
+            "to": [ 7.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.5, 0.0, 1.5 ], 
+            "to": [ 14.5, 1.0, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "east": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "south": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "west": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "up": { "texture": "#2", "uv": [ 1.5, 1.5, 14.5, 14.5 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
             }
         }
     ]
diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json
index 7e0b9cf7b..40d7fa193 100644
--- a/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json
+++ b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json
@@ -1,36 +1,62 @@
 {
     "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
     "textures": {
-        "0": "actuallyadditions:blocks/blockOilGenerator",
-        "1": "actuallyadditions:blocks/blockCoalGeneratorSide",
-        "2": "actuallyadditions:blocks/blockCoalGeneratorTop",
-        "3": "actuallyadditions:blocks/blockCoalGeneratorBottom"
+        "0": "actuallyadditions:blocks/blockOilGeneratorTop",
+        "1": "actuallyadditions:blocks/blockOilGenerator",
+        "2": "actuallyadditions:blocks/blockCoalGeneratorBottom",
+        "3": "actuallyadditions:blocks/blockCoalGeneratorSide"
     },
     "elements": [
         {
             "name": "Cube",
-            "from": [ 1.0, 0.0, 1.0 ], 
-            "to": [ 15.0, 15.0, 15.0 ], 
+            "from": [ 15.0, 15.0, 1.0 ], 
+            "to": [ 16.0, 16.0, 15.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "east": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] },
-                "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "cullface": "up" },
-                "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
             }
         },
         {
-            "name": "Outline",
-            "from": [ 0.0, 0.0, 0.0 ], 
-            "to": [ 1.0, 15.0, 1.0 ], 
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 15.0 ], 
+            "to": [ 16.0, 16.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 1.0 ], 
+            "to": [ 1.0, 16.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 0.0 ], 
+            "to": [ 16.0, 16.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
             }
         },
         {
@@ -38,25 +64,25 @@
             "from": [ 0.0, 0.0, 15.0 ], 
             "to": [ 1.0, 15.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
             "name": "Cube",
-            "from": [ 15.0, 0.0, 15.0 ], 
-            "to": [ 16.0, 15.0, 16.0 ], 
+            "from": [ 0.0, 0.0, 0.0 ], 
+            "to": [ 1.0, 15.0, 1.0 ], 
             "faces": {
-                "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
@@ -64,25 +90,285 @@
             "from": [ 15.0, 0.0, 0.0 ], 
             "to": [ 16.0, 15.0, 1.0 ], 
             "faces": {
-                "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
-                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] },
-                "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-                "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
             }
         },
         {
             "name": "Cube",
-            "from": [ 0.0, 15.0, 0.0 ], 
-            "to": [ 16.0, 16.0, 16.0 ], 
+            "from": [ 15.0, 0.0, 15.0 ], 
+            "to": [ 16.0, 15.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
-                "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 1.0, 1.0 ], 
+            "to": [ 15.0, 15.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
+                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.5, 0.0, 1.0 ], 
+            "to": [ 1.5, 15.5, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "east": { "texture": "#2", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "west": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 2.0, 15.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 2.0, 1.0, 16.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.5, 0.0, 1.0 ], 
+            "to": [ 15.5, 15.5, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "east": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "west": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "up": { "texture": "#0", "uv": [ 14.0, 1.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 14.5 ], 
+            "to": [ 15.0, 15.5, 15.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "south": { "texture": "#3", "uv": [ 1.0, 0.5, 15.0, 16.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 15.5 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 14.0, 15.0, 15.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 13.0, 0.5 ], 
+            "to": [ 15.0, 15.5, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 0.5, 15.0, 3.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 2.5 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 0.0, 14.0, 2.5 ] },
+                "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 2.5 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 2.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 14.5, 1.5 ], 
+            "to": [ 14.5, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.5, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 2.5, 5.0, 15.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.5, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 10.0, 1.5, 14.5, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 10.0, 1.5, 14.5, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.5, 14.5, 1.5 ], 
+            "to": [ 6.0, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "east": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "west": { "texture": "#0", "uv": [ 1.5, 5.0, 14.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.5, 1.5, 6.0, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 1.5, 1.5, 6.0, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 14.5, 1.5 ], 
+            "to": [ 10.0, 15.5, 6.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 5.0, 10.0, 6.0 ] },
+                "east": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 5.0, 10.0, 6.0 ] },
+                "west": { "texture": "#0", "uv": [ 6.0, 5.0, 10.5, 6.0 ] },
+                "up": { "texture": "#0", "uv": [ 6.0, 1.5, 10.0, 6.0 ] },
+                "down": { "texture": "#0", "uv": [ 6.0, 1.5, 10.0, 6.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 14.5, 10.0 ], 
+            "to": [ 10.0, 15.5, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 11.0 ] },
+                "east": { "texture": "#0", "uv": [ 6.0, 10.0, 10.5, 11.0 ] },
+                "south": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 11.0 ] },
+                "west": { "texture": "#0", "uv": [ 6.0, 10.0, 10.5, 11.0 ] },
+                "up": { "texture": "#0", "uv": [ 6.0, 10.0, 10.0, 14.5 ] },
+                "down": { "texture": "#0", "uv": [ 6.5, 10.0, 10.5, 14.5 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 0.5 ], 
+            "to": [ 15.0, 3.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 16.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 11.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 16.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 5.0, 3.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 15.0, 15.0, 16.0 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 4.0, 12.0, 0.5 ], 
+            "to": [ 6.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 3.0, 11.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 10.0, 3.0, 11.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 6.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 10.0, 3.0, 12.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 4.0, 0.5 ], 
+            "to": [ 15.0, 8.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 12.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 12.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 12.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 5.0, 3.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 15.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 12.0, 8.0, 0.5 ], 
+            "to": [ 15.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 8.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 8.0, 3.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 3.0, 3.0, 4.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 8.0, 4.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 8.0, 0.5 ], 
+            "to": [ 4.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 12.0, 3.0, 15.0, 8.0 ] },
+                "east": { "texture": "#1", "uv": [ 12.0, 3.0, 13.0, 8.0 ] },
+                "south": { "texture": "#1", "uv": [ 12.0, 3.0, 15.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 3.0, 15.0, 8.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 9.0, 3.0, 0.5 ], 
+            "to": [ 10.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 6.0, 12.0, 7.0, 13.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 12.0, 3.0, 0.5 ], 
+            "to": [ 15.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 12.0, 4.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 3.0, 12.0, 4.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 12.0, 4.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 3.0, 12.0, 4.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 12.0, 0.5 ], 
+            "to": [ 12.0, 13.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 6.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 3.0, 6.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 3.0, 0.5 ], 
+            "to": [ 4.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 12.0, 12.0, 15.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 12.0, 12.0, 13.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 12.0, 12.0, 15.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 3.0, 15.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 8.0, 7.0, 9.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 11.0, 4.0, 12.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 3.0, 0.5 ], 
+            "to": [ 7.0, 4.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "east": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "south": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "west": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "up": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 9.0, 12.0, 10.0, 13.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.5, 0.0, 1.5 ], 
+            "to": [ 14.5, 1.0, 14.5 ], 
+            "faces": {
+                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "east": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "south": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "west": { "texture": "#2", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+                "up": { "texture": "#2", "uv": [ 1.5, 1.5, 14.5, 14.5 ] },
+                "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
             }
         }
     ]
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png
index 831f0f8d17262d138e6ebd5f7ed4258942aa5d7c..3b569f3dffc056ab6deafbb67e5aa1b262fc4dab 100644
GIT binary patch
delta 1224
zcmV;(1ULJ;ANL-xzzTn&Nkl<Zc-rjPPjlS18OQN29spb}cfBi1w$#><a!6;I<j@!3
zi(h-Mo%WWbacfVkIL=76D|@vjm&CuP2U;E}*3=udz0^LF1i%NtXMTWr@Zf=}Dy0;1
z&KP4b2CQ|&7*SQM6|8lrDmiCFgq$+~F6YeN-X6|5thIRW5D|Y2;Jn8<M+gCHEh3h#
z>&E9|c=-K8+}NX`X&StD;|PHDo0e{~0l<6D-rgR@7^=z>LZt6|oU`Ky07ML6I6XPV
zR~}y;BY>(>lJN7hFDR<qyZ1Xp3@Ig4!2y&~h%s?;a>8$KpCMwH)-#5vl$4k^73=mG
zRrukDfy2W?N-2MoQpN_1F=)vQLm=mbb)FCli>5+k!mD+MSOdtrVxx?8F~$IpOJNuW
z=8fmpv_iG888R4U(NxTv3e`;C4`c5-jzFxnq?9nm5MyLW(8tWY@ieue+eAWwm|%A?
zC&oa|g_IH^f(s$A*>p^&Q;v>~`0F>1P*t28r}N@p#Rz{Xw|xEeSA;Oow(a<yF$QZL
zIcJ=6eEH=cFvb$XKvj9HSQHQu`o5>CDnf`<RfV;7ETXF7y+_1QRgR{aAp*t-lSxI+
zk**7PC-i;9T1(EE5CT$4!5BkI5mk8d<SBjM^4)iTr<6e3uKD)cf1sK;{_z>jtR{r9
zkk(q{VjX{Y?|Az3DPMiwvez6_O5xt}m@f`~CWOGjttb5P_ZuEQd_>OqUE#%A3&3X6
zb9nd}e><M>e0@YIg;gtj|I<FI%ClF8{P`Qh(a~pEYf;s)hyXcf`o3ov0?Xx+5F!T$
zcNoHJ&dydG9PCr`i2eP$tX3;x9H%hGIPQfI0)2nqBO<6O7lnQP+>_D^RF$w?@#5UP
z+s-0_a}HP6HP?IKuXyl!a~J1y{O|vB4|b-f%%&C7dWN@_^EW++pm|FVmiwNp5Mm)_
zWp`&rii!26Z0CU$gBVaPEM^rL#mL)EuJOQKcu?1qw;mXF7gJJ>tlI%Af-%DFWkXK7
ztp|VoB@f~y5Ar7u{udsY`}gl_RaI1##~7iiDw?JyrHHkj5C)v{<eX3)S8R-lQk2zd
z_3u46*g5C<YKf|{zg+R+eCOABaPjfS=z$o+?%q`oy6!Rc#BJxnq^jscy5hln>S#CV
zJrCS3J?KM5i8Qstdj}}(FzQ@S?1w$rnb&_*m1ni?kdUz=>@KIIqP*$ihdubyUoPhZ
zee1#IlLx=n1F_A2$Af!!Ui0JW;^rP)&Ij)n+)eYr#d+al@ZdK)|0Kjr-Bc{+H7RGh
zA=7n_DQuAsO3B>0-5>&8NQf~krk?rKp%~78`anJ~Vz6QWWihKTKs!W0DJ5^`K_7oJ
zIVB`ymh%aUr|lA1xrqmFKIMb|)PuA2xI?>8Z|}k3!HUyYyEo4VFJFS{$(4L?BM&a;
zgOAOFv9Sv49JM!yF|6BT+CIJKfn4W-Si@pI;nviV%DA1y8V>HvKb#Nd%@{D0LLU?Z
z%%^_5!6{pw7u1X%EanwPEStWd%632=T)jUSesO>B$%7l67jERib?1e}<QZq}-R(Ts
myLHCP^V`>W@bWzm{xty5#$6UmWAkkQ0000<MNUMnLSTY5q-_lV

delta 1293
zcmV+o1@ij$9=ji~zzTonNkl<Zc-rjP&u<&Y8OHJNyfZsoE@_hb$rg=Wq;?Jgk^%vI
z^2L9BiXgWDjb+z$P{(!<+p-jrCU<v!y*<zg)JTX_wY}87?rC>`=d;f<=KlTrs;ZPy
z$T=e-7-OhwPuq5=D&ALskaH&IjJ1}O5&*80!ok5l#t5UP##Mg~E0)R$mG@MYBZL6P
z5@Tk$Tv1gHFdQ8n;Y0*gm`p}YCL_cM&Ki#2oMJW`vMK{#@w?y8Nm&^V2ZRu4+aB*L
zTuKRFSq9$Yo#W~E&l%R9ZuI~FRizi9?>{BR%<bDBlXGUXX)(s&w%@Oml6m~(J9dUI
zkzzR58_`Flq{M%?@vPR55#ZYgfjgi42@!}f;Q&O;_CW|_pRleX#KNTUhzvMgZ4he!
z!9*p71Zr^3AtHvNg;JE5BIBmw#?Yf$X!{ICnKYhp<5A7D>khGCoge}tV#%o>0$m&E
z6Lc{%ZYrAEuxTS9K}@ha8Iwz-?;<G$axS<SBdfP>sfT|xcRu-;2S<+(B6U5$ib0H{
zkBM9$gf(~XenH!Hym_<O9wI<hRfrf=h0j0xoPoE*7#WXh6bPwMveLF4Ml5Z+rm8By
zAjTL%h?D|37gEmHs$&0OhDyb3XNTEr0!A1%LrzbYIA;-o5CW2O#u!82_k@sm^5h>Z
z7E8YT%Qt^$$-MaCC0~8@4Jkz)K77Jx+z>)f-$$&q2tX+X=Pb{jJ>%0quGwpzQc7X3
z{u{UFKM+FTVDue-zSHvH!6RZ!q?9nmAl6y{+P357&5t;GI^xyp7NryxYvJMZLsXR)
zr#JcfuZCN<KEhgys-mjfL(DnTbsc>lm`<mJ5Sf3^_vyn=oSZC}&kw2jJBNn{EEWr5
zOo#|EMqJLB5CUD-u??2~l7UyRDpGolsuHFPUN6lrkrxr1bGW*$`7IBOfx*DD?B_VQ
zJ@Ef`4{GxqS3C!MBPwfIzU@E+O&5D0zxH5yqrwP;SlEQb?rg+lSRvM6oyEu{9&8f`
zs)c{a$b(UgfHCGm58Oo_>`sQH99gY<tO&*kJJW`ol;^Ln<iYx#2Nhz>I}ZXO#19_)
zFFY{!?%h-GJ>FLsBY5v=nwpd%)>eej<6K3~3DrW3i5L^5D2v77w>_B8mb_X_QB@A7
z3tlg0|DFfOE5R6jFFlAGbIya!`iR=Q%lm)9e7|DgJzYq|tnAK4q?i~F9qTro>j&=F
z9&{n2M4H;YJ1k}0M^u%1U}=vp@nANt@xEfQ+8`lgMcADVNkw_PiI?|-ufKhS5YF@i
zLm$Jteh|5P_p=WkT*U*i&40&(KkWa+_b(^c_uy<lFvjq68M#(J_<1k94<5|w9|?b(
z%&759$2BQuHhpHZKBDLq_CoQQ{hbC8*o1@_!(>=79y%1mi<3+Gff0ih11OV`#{la-
z0^7H|v>(jIHC@c)l#q~_jt3|e>rEmnSM@;8c%WzY!Uqqo<-y5no6t?DukOLk`GS|H
zyVvgr$H$=h<G=KSYk6?CAG~iKNH%|r8jp33y4wC9SL?@geY$)vl#&r^n2ZP97&=nf
z##yXkzCS*<7u-en2Lta>3SCePFdkN@D!E*7FR0miFd6%8`nrNDSM%Wf{Q>l`eDL5u
z*$db5;G(@S8NA?ReQ-4o_HLYTyxh6KgX41^{Br;lj9T-(Q{nFb0000<MNS1ou0mjf
D&;WKg

diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png
index 920f7b62582c18d0f79eee538bf4243244980ead..24606d2a8bf37036b458e326576c6d0663797b9e 100644
GIT binary patch
literal 4550
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

delta 690
zcmV;j0!{tKBfSNX7k>~41^@s6AM^iV00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z4!ZyV4!Z%z_|!H4000McNliru-wYQQAr?lUlR5wZ0!m3lK~y-)ZIjQAR8<hhe^saM
z?aXu<VI=7p&G-V4R#qgqU_*#R0_=D{H%2$c#6$xjtb70;0Dt2~{xpI*%=Ap(Q>ThW
z-|1jtCAB!4FW>ooU&-fJuO=dBDKvK?6BWTq!CON_5I|LlOmbX+%)}CS_}~^#fBg+2
zC}xNV>-Czx?`iI!N~cNy?#`s|`SSV|zWd=Z^2K722mAYE1Rg<WhL*xG3<zu;B#;q^
zDhUYi;^j*W5r1l}s0c-s^?HqnaA`J0yPoP5Rb_oPusS_OGbySd0)RDlR231yRB5Vw
zcDT=l*^J4~6t8O#<@NG4!>dYf#?ac<orx;V9qT$gf=@r0b2d2NfAcL?3L-*ea_9Cf
z4(6A6@#-%SA>08_$;8ZXcV@FG^ZA?~fBKoe>o}jzjDKGqJz?+i9@E_(Q$@^B5fl;5
zF?t>FR<Tlui2rOUiinaa4DOp?Gf^^W?uZD8qOwW(|EAW;WHQ;l6HploVyau!)*7n1
z-J*)O#&mZFZ;q9Mjv|^7s48S~biCsDWX1ivcNl8jq8h4m@9VF4^X4t9lQSX$n@ngC
zn<9O@w|_^9(3L{8#^K=s7cYJUq9d;4-=h<LfA$A<9<B(><r0gC4bM_=cXoGn`1ARa
zw}1abXGTP#s=PZo#<~t2u`+(uL<AkXP|O%=B{DfZtE_TBM@nKww6+OOl{Oxl0^Gc@
z*yd2oDCdHukeSqBAX~$0rHprS^TvY6M6N9snJbwaTd=8fCbd?&56UE}s0gjKty>Y{
YJ$&srRuW=Lw*UYD07*qoM6N<$g7WG*j{pDw

diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png.mcmeta
new file mode 100644
index 000000000..b5b91e18a
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation":
+  {
+    "frametime": 3
+  }
+}
\ No newline at end of file