From 122229143a984599adb9795d97b7097173dbbdc9 Mon Sep 17 00:00:00 2001
From: BootyToast <drbootytoast@gmail.com>
Date: Wed, 17 Aug 2016 11:25:59 -0400
Subject: [PATCH] New fermenting barrel texture and model.

---
 .../mod/blocks/BlockFermentingBarrel.java     |   9 +
 .../blockstates/blockFermentingBarrel.json    |   6 +-
 .../models/block/blockFermentingBarrel.json   | 607 ++++++++++++++++++
 .../textures/blocks/blockFermentingBarrel.png | Bin 783 -> 767 bytes
 4 files changed, 618 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockFermentingBarrel.json

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
index b945d1462..b44cb6bde 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
@@ -36,6 +36,15 @@ public class BlockFermentingBarrel extends BlockContainerBase{
         this.setSoundType(SoundType.WOOD);
     }
 
+    @Override
+    public boolean isFullCube(IBlockState state){
+        return false;
+    }
+
+    @Override
+    public boolean isOpaqueCube(IBlockState state){
+        return false;
+    }
 
     @Override
     public TileEntity createNewTileEntity(World world, int par2){
diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json
index 31c1e4fe0..a10517e85 100644
--- a/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json
+++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json
@@ -1,11 +1,9 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "minecraft:cube_bottom_top",
+    "model": "actuallyadditions:blockFermentingBarrel",
     "textures": {
-      "side": "actuallyadditions:blocks/blockFermentingBarrel",
-      "bottom": "#top",
-      "top": "actuallyadditions:blocks/blockFermentingBarrelTop"
+      "particle": "actuallyadditions:blocks/blockFermentingBarrel"
     },
     "transform": "forge:default-block"
   },
diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockFermentingBarrel.json b/src/main/resources/assets/actuallyadditions/models/block/blockFermentingBarrel.json
new file mode 100644
index 000000000..ed3830272
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/models/block/blockFermentingBarrel.json
@@ -0,0 +1,607 @@
+{
+    "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
+    "textures": {
+        "0": "actuallyadditions:blocks/blockGiantChestTop",
+        "1": "actuallyadditions:blocks/blockFermentingBarrel"
+    },
+    "elements": [
+        {
+            "name": "Cube",
+            "from": [ 2.0, 0.5, 2.0 ], 
+            "to": [ 14.0, 15.5, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 15.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 15.0 ] },
+                "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 15.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 15.0 ] },
+                "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 1.0, 1.0 ], 
+            "to": [ 14.0, 15.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 2.0, 15.0, 14.0, 16.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 4.0, 1.0, 0.5 ], 
+            "to": [ 6.0, 15.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 1.0, 11.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 11.0, 1.0, 12.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 10.0, 14.0, 12.0, 15.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 1.0, 0.5 ], 
+            "to": [ 12.0, 15.0, 1.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 14.0, 6.0, 15.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 2.0, 0.0 ], 
+            "to": [ 14.0, 4.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 14.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 12.0, 1.0, 14.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 14.0 ] },
+                "west": { "texture": "#1", "uv": [ 15.0, 12.0, 16.0, 14.0 ] },
+                "up": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 0.0, 13.0, 12.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 7.0, 0.0 ], 
+            "to": [ 14.0, 9.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 7.0, 2.0, 9.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 7.0, 15.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 8.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 8.0, 13.0, 9.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 12.0, 0.0 ], 
+            "to": [ 14.0, 14.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 14.0, 2.0, 15.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 3.0 ], "rotation": 180 },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 13.0, 4.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 1.0, 2.0 ], 
+            "to": [ 2.0, 15.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 3.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 2.0, 16.0, 14.0, 15.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 1.0, 2.0 ], 
+            "to": [ 15.0, 15.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 3.0 ], "rotation": 270 },
+                "down": { "texture": "#1", "uv": [ 2.0, 16.0, 14.0, 15.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 1.0, 14.0 ], 
+            "to": [ 14.0, 15.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 15.0, 1.0, 16.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 2.0, 1.0, 14.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 2.0, 15.0, 14.0, 16.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 1.0, 14.5 ], 
+            "to": [ 12.0, 15.0, 15.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 14.0, 6.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 4.0, 1.0, 14.5 ], 
+            "to": [ 6.0, 15.0, 15.5 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 14.0, 6.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.5, 1.0, 10.0 ], 
+            "to": [ 1.5, 15.0, 12.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 10.0, 1.0, 11.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 11.0, 1.0, 12.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 2.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 10.0, 14.0, 12.0, 15.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 7.5, 1.0, 4.0 ], 
+            "to": [ 8.5, 15.0, 6.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 4.0, 15.0, 6.0, 16.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.5, 1.0, 10.0 ], 
+            "to": [ 15.5, 15.0, 12.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ], "rotation": 270 },
+                "down": { "texture": "#1", "uv": [ 4.0, 14.0, 6.0, 15.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.5, 1.0, 4.0 ], 
+            "to": [ 15.5, 15.0, 6.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 1.0, 5.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 5.0, 1.0, 6.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 4.0, 14.0, 6.0, 15.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 12.0, 1.0 ], 
+            "to": [ 15.0, 14.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 7.0, 1.0 ], 
+            "to": [ 15.0, 9.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 2.0, 1.0 ], 
+            "to": [ 15.0, 4.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 2.0, 1.0 ], 
+            "to": [ 2.0, 4.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 7.0, 1.0 ], 
+            "to": [ 2.0, 9.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 7.0, 14.0 ], 
+            "to": [ 2.0, 9.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 12.0, 14.0 ], 
+            "to": [ 2.0, 14.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 2.0, 14.0 ], 
+            "to": [ 2.0, 4.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 2.0, 14.0 ], 
+            "to": [ 15.0, 4.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 7.0, 14.0 ], 
+            "to": [ 15.0, 9.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 12.0, 14.0 ], 
+            "to": [ 15.0, 14.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 12.0, 15.0 ], 
+            "to": [ 14.0, 14.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 14.0, 2.0, 15.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 13.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 7.0, 15.0 ], 
+            "to": [ 14.0, 9.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 0.0, 7.0, 12.0, 9.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 7.0, 1.0, 9.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 7.0, 12.0, 9.0 ] },
+                "west": { "texture": "#1", "uv": [ 15.0, 7.0, 16.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 0.0, 7.0, 12.0, 8.0 ] },
+                "down": { "texture": "#1", "uv": [ 0.0, 8.0, 12.0, 9.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 2.0, 15.0 ], 
+            "to": [ 14.0, 4.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 14.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 12.0, 1.0, 14.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 14.0 ] },
+                "west": { "texture": "#1", "uv": [ 15.0, 12.0, 16.0, 14.0 ] },
+                "up": { "texture": "#1", "uv": [ 0.0, 12.0, 12.0, 13.0 ] },
+                "down": { "texture": "#1", "uv": [ 0.0, 13.0, 12.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 2.0, 2.0 ], 
+            "to": [ 16.0, 4.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 14.0, 12.0, 15.0, 14.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 12.0, 13.0, 14.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 12.0, 2.0, 14.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 12.0, 13.0, 14.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 12.0, 15.0, 13.0 ], "rotation": 270 },
+                "down": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 14.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 7.0, 2.0 ], 
+            "to": [ 16.0, 9.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 14.0, 7.0, 15.0, 9.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 7.0, 2.0, 9.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 7.0, 15.0, 8.0 ], "rotation": 270 },
+                "down": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 9.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 12.0, 2.0 ], 
+            "to": [ 16.0, 14.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 14.0, 2.0, 15.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 15.0, 3.0 ], "rotation": 270 },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 15.0, 4.0 ], "rotation": 270 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 15.0, 14.0 ], 
+            "to": [ 14.0, 16.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ], "rotation": 180 },
+                "east": { "texture": "#0", "uv": [ 7.0, 3.0, 8.0, 4.0 ] },
+                "south": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] },
+                "west": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 4.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] },
+                "down": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 15.0, 1.0 ], 
+            "to": [ 14.0, 16.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ], "rotation": 180 },
+                "east": { "texture": "#0", "uv": [ 1.0, 3.0, 2.0, 4.0 ] },
+                "south": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ], "rotation": 180 },
+                "west": { "texture": "#0", "uv": [ 10.0, 3.0, 11.0, 4.0 ] },
+                "up": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] },
+                "down": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 15.0, 2.0 ], 
+            "to": [ 2.0, 16.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 3.0 ] },
+                "east": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 90 },
+                "south": { "texture": "#0", "uv": [ 15.0, 13.0, 16.0, 14.0 ] },
+                "west": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 270 },
+                "up": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ] },
+                "down": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 15.0, 2.0 ], 
+            "to": [ 15.0, 16.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 13.0, 1.0, 14.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 270 },
+                "south": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 90 },
+                "up": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 180 },
+                "down": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.5, 1.0, 4.0 ], 
+            "to": [ 1.5, 15.0, 6.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 10.0, 1.0, 11.0, 15.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "south": { "texture": "#1", "uv": [ 11.0, 1.0, 12.0, 15.0 ] },
+                "west": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 15.0 ] },
+                "up": { "texture": "#1", "uv": [ 10.0, 1.0, 12.0, 2.0 ] },
+                "down": { "texture": "#1", "uv": [ 10.0, 14.0, 12.0, 15.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 12.0, 1.0 ], 
+            "to": [ 2.0, 14.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 3.0 ] },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 2.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 2.0, 2.0 ], 
+            "to": [ 1.0, 4.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 12.0, 2.0, 14.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 12.0, 13.0, 14.0 ] },
+                "south": { "texture": "#1", "uv": [ 14.0, 12.0, 15.0, 14.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 12.0, 13.0, 14.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 12.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 1.0, 13.0, 15.0, 14.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 7.0, 2.0 ], 
+            "to": [ 1.0, 9.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 7.0, 2.0, 9.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "south": { "texture": "#1", "uv": [ 14.0, 7.0, 15.0, 9.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 7.0, 13.0, 9.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 7.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 1.0, 8.0, 15.0, 9.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 12.0, 2.0 ], 
+            "to": [ 1.0, 14.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 1.0, 2.0, 2.0, 4.0 ] },
+                "east": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "south": { "texture": "#1", "uv": [ 14.0, 2.0, 15.0, 4.0 ] },
+                "west": { "texture": "#1", "uv": [ 1.0, 2.0, 13.0, 4.0 ] },
+                "up": { "texture": "#1", "uv": [ 1.0, 3.0, 15.0, 2.0 ], "rotation": 90 },
+                "down": { "texture": "#1", "uv": [ 1.0, 3.0, 15.0, 4.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 2.0 ], 
+            "to": [ 2.0, 1.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 15.0, 13.0, 16.0, 14.0 ] },
+                "east": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 90 },
+                "south": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 3.0 ] },
+                "west": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 90 },
+                "up": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 180 },
+                "down": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 14.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 14.0, 0.0, 2.0 ], 
+            "to": [ 15.0, 1.0, 14.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 0.0, 13.0, 1.0, 14.0 ] },
+                "east": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 90 },
+                "south": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+                "west": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 90 },
+                "up": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 180 },
+                "down": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 14.0 ], "rotation": 180 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 0.0, 14.0 ], 
+            "to": [ 14.0, 1.0, 15.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] },
+                "east": { "texture": "#0", "uv": [ 1.0, 3.0, 2.0, 4.0 ] },
+                "south": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] },
+                "west": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 4.0 ] },
+                "up": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] },
+                "down": { "texture": "#0", "uv": [ 1.0, 3.0, 13.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 2.0, 0.0, 1.0 ], 
+            "to": [ 14.0, 1.0, 2.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] },
+                "east": { "texture": "#0", "uv": [ 2.0, 3.0, 3.0, 4.0 ] },
+                "south": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] },
+                "west": { "texture": "#0", "uv": [ 13.0, 3.0, 14.0, 4.0 ] },
+                "up": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] },
+                "down": { "texture": "#0", "uv": [ 2.0, 3.0, 14.0, 4.0 ] }
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockFermentingBarrel.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFermentingBarrel.png
index c0340d0e54e65c15ec50e2e77e34d41839b95a79..2152f8bcc46d62c1d6d14621869a64e79b99151a 100644
GIT binary patch
delta 754
zcmV<O0uB9-2LA<+8Gix*005AYXf^-<010qNS#tmYE+YT{E+YYWr9XB6001CkNK#Dz
z0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM00M<cL_t(|+C0$PZqqOT
z0MOWR630oLY;AW#ErShc8I{HaNPxsXfJgp;58>~4L?G@rv4664V{6mI*Eq3xK;nGD
z0gn#G{UV0Ip&&>}^7iX&kVVdQJxW;P`fJ6TFS8rhdd8SMiC%x0A#FPgyeJ4`9G?6s
zX@W~-2m(!OEdVE%B~7FC40nzIA8r*1dhv9JWC_WWEXfHia7J-NP(Vzp8pUK?iK^sm
z#VXD?-%2Q2Fn^^TY#h+Wj}45pjY5NvYCGM?S_vT;<3h+<a;db`;Mw8i-p&4sY3l)|
zI%hP+C`;nb+7Ji7ue5FC*5(?7u*mZ_AAZ6x3a69(qv@RohvOhX)&qle>JS<Xis@uO
z2vO&Oqr-7Q>1ewbA_yKH+#VFkzojq;=L;5k?f<1LO@Gg>>UE0$E&Z5Xq34gc(=178
zl4g0F6*!@oqzK`*RZ3KfGg*}tuf&QmE=T<Wl|mT@8wX|U#|^~VhFl{*Hk~%IRzfJo
zgy6iEQVJ;>^zpmCxxex0v~J954WG{bl#{)Y^I=`C(wxew`gOj%du#aaTQwf8f1b?|
z6N&)SBY(a$pkks``sc|R!2xtFDdIWTt<t=z_qOv86RizQ<8V5i+&vhNMmxZ|ltjbL
zA`ZZIznD%Z(7BXEJJ)wNdqs$R(^>H9<uOT8k`tQdaaP0`jc|$(ZjDlsDPD=X<g8*V
z#<)~MpapAmCmQGJ#*Z5qX&Xfv`ElFnMsvlO<ZDcF&TGlJ(prP#!|{{*d!=+t$g*5X
zq4tKG)&sUP8$J5|`<yYkJKC9FE(i|J&X<0X=NNgO?R)^v7JOODVUHLo<G{Zt*+r$7
km4wiNuC>;lFZtgA0K=7tmG5KBg8%>k07*qoM6N<$g332u1^@s6

delta 770
zcmV+d1O5E}1&;=h8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-yn5)Th0+Kiiv0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#9b4f%&R5;6ZlFe@$RTRa4_kYeC$DRp|)8Gb?xJqy<
zHic|x0U<s%p#I~Pkcxy<gjk_KLzCJ@4oT+2W6!&n#Y|U-#nXGzJLevqbB~-&cl_bu
z9(k5A$})bxSaMU;eDnFIoJ@~cuh*1i#fzU_vAQXF_Q@&Dx}mCS&abWsDq!ZAI~JY6
zASE9;qu~xBf`8+<J87CSNCPoC0Os8t@&o1mamMNFh}ol4PG%2z|APnYjxy3@z}26Z
z%$F;^`r!#JEoE7-Tr9cx<C133B2Q08elH)fzn7EeIT!OAimK-McV93b-=iuk{<*p1
z<*VN)$~9*nPpPYl>)Vp~sz6l)RRIKda5qE*0dNozRDZR{I58TCGDrggXlqWANawfr
z<#a?dLl8nxx-Vf9BjALdqh=imfoNS|y*_P>Ah2y?2N8&^b$GN7@xCybW}M89m_7Q4
zli8HX;e<TP86*R)UcX_!xaQmEXMKowEEfy@I=`Y0O+TjB6ui@ZmjQskdwG94ymtiT
z*(~?N{eNAC!yzF}nXhhX8sp2)o^Y@~#w=1+6)#@?LRqhQJbi#*6!n_7f8V0+*3ES%
zQ6&v22sE25=7yPJ(MXcsb4YMNMGypSTch2!eX|?{RFyOY5>-TnXps;CqTM#kjMzq!
zL{Udb(}0TL-tBzbwjEgnH|MUb8SV^F5zHMGC3~cSwl%`;fiV7X`2SUYeaU>W!s7Nn
zRbGb;ayH%Z<H>vMW;w&rh>Q7(qTcZR*H0Ob_t-WKMOpFV&%aVsYi7q2@W^Jf;rz{t
z0HC5IA)#p_Z8Y4wkW>UwAxV<H=HAs@6zP}xFB<tg9Ur2rMgRZ+07*qoM6N<$f<X#j
A{{R30