Merge remote-tracking branch 'origin/master'

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java

@@ -18,7 +18,9 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
@@ -27,6 +29,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -35,6 +38,8 @@ import java.util.Random;
 
 public class BlockOilGenerator extends BlockContainerBase{
 
+    private static final PropertyInteger META = PropertyInteger.create("meta", 0, 7);
+
     public BlockOilGenerator(String name){
         super(Material.ROCK, name);
         this.setHarvestLevel("pickaxe", 0);
@@ -45,6 +50,17 @@ public class BlockOilGenerator extends BlockContainerBase{
     }
 
 
+    @Override
+    public boolean isFullCube(IBlockState state){
+        return false;
+    }
+
+    @Override
+    public boolean isOpaqueCube(IBlockState state){
+        return false;
+    }
+
+
     @Override
     public TileEntity createNewTileEntity(World world, int par2){
         return new TileEntityOilGenerator();
@@ -77,6 +93,26 @@ public class BlockOilGenerator extends BlockContainerBase{
         return true;
     }
 
+    @Override
+    public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
+        int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
+
+        if(rotation == 0){
+            world.setBlockState(pos, this.getStateFromMeta(0), 2);
+        }
+        if(rotation == 1){
+            world.setBlockState(pos, this.getStateFromMeta(3), 2);
+        }
+        if(rotation == 2){
+            world.setBlockState(pos, this.getStateFromMeta(1), 2);
+        }
+        if(rotation == 3){
+            world.setBlockState(pos, this.getStateFromMeta(2), 2);
+        }
+
+        super.onBlockPlacedBy(world, pos, state, player, stack);
+    }
+
     @Override
     public EnumRarity getRarity(ItemStack stack){
         return EnumRarity.RARE;
@@ -87,4 +123,10 @@ public class BlockOilGenerator extends BlockContainerBase{
         this.dropInventory(world, pos);
         super.breakBlock(world, pos, state);
     }
+
+    @Override
+    protected PropertyInteger getMetaProperty(){
+        return META;
+    }
+
 }

src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json

@@ -1,16 +1,20 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "minecraft:cube_bottom_top",
+    "model": "actuallyadditions:blockOilGenerator",
     "textures": {
-      "side": "actuallyadditions:blocks/blockOilGenerator",
+      "particle": "actuallyadditions:blocks/blockOilGenerator"
-      "bottom": "actuallyadditions:blocks/blockOilGeneratorBottom",
-      "top": "actuallyadditions:blocks/blockOilGeneratorTop"
     },
     "transform": "forge:default-block"
   },
   "variants": {
     "normal": [{}],
-    "inventory": [{}]
+    "inventory": [{}],
+    "meta": {
+      "0": { "y" : 0 },
+      "1": { "y" : 180 },
+      "2": { "y" : 270 },
+      "3": { "y" : 90 }
+    }
   }
 }

src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json

@@ -149,6 +149,127 @@
                 "up": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
                 "down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
             }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 8.0, 6.0 ], 
+            "to": [ 10.0, 9.0, 10.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 7.0 ], "rotation": 180 },
+                "east": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] },
+                "south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] },
+                "west": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 10.0 ], "rotation": 270 },
+                "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
+                "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 4.0, 8.0, 6.0 ], 
+            "to": [ 6.0, 9.0, 10.0 ], 
+            "rotation": { "origin": [ 6.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 },
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] },
+                "east": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 },
+                "south": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] },
+                "west": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 },
+                "up": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] },
+                "down": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 10.0, 8.0, 6.0 ], 
+            "to": [ 12.0, 9.0, 10.0 ], 
+            "rotation": { "origin": [ 10.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 },
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] },
+                "east": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 },
+                "south": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] },
+                "west": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 },
+                "up": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] },
+                "down": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 8.0, 10.0 ], 
+            "to": [ 10.0, 9.0, 12.0 ], 
+            "rotation": { "origin": [ 8.0, 9.0, 10.0 ], "axis": "x", "angle": 45.0 },
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
+                "east": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] },
+                "south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
+                "west": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] },
+                "up": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
+                "down": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 6.0, 8.0, 4.0 ], 
+            "to": [ 10.0, 9.0, 6.0 ], 
+            "rotation": { "origin": [ 8.0, 9.0, 6.0 ], "axis": "x", "angle": -45.0 },
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
+                "east": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] },
+                "south": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
+                "west": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] },
+                "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
+                "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 6.0, 0.0 ], 
+            "to": [ 1.0, 9.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 6.0, 0.0 ], 
+            "to": [ 16.0, 9.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 6.0, 15.0 ], 
+            "to": [ 16.0, 9.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 6.0, 15.0 ], 
+            "to": [ 1.0, 9.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
+                "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+                "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
+            }
         }
     ]
 }

src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json

@@ -3,8 +3,7 @@
     "textures": {
         "0": "actuallyadditions:blocks/blockCoalGeneratorSide",
         "1": "actuallyadditions:blocks/blockMiscIronCasing",
-        "2": "actuallyadditions:blocks/blockAtomicReconstructorTop",
+        "2": "actuallyadditions:blocks/blockEmpowerer"
-        "3": "actuallyadditions:blocks/blockEmpowerer"
     },
     "elements": [
         {
@@ -90,12 +89,12 @@
             "from": [ 2.0, 6.0, 0.0 ], 
             "to": [ 14.0, 7.0, 16.0 ], 
             "faces": {
-                "north": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
+                "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
-                "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "south": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
-                "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "up": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
+                "up": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
-                "down": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }
+                "down": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }
             }
         },
         {
@@ -103,12 +102,12 @@
             "from": [ 0.0, 6.0, 2.0 ], 
             "to": [ 16.0, 7.0, 14.0 ], 
             "faces": {
-                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "east": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
-                "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "west": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
+                "west": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
-                "up": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] },
+                "up": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] },
-                "down": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }
+                "down": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }
             }
         },
         {
@@ -116,12 +115,12 @@
             "from": [ 1.0, 7.0, 1.0 ], 
             "to": [ 15.0, 8.0, 15.0 ], 
             "faces": {
-                "north": { "texture": "#3", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+                "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "east": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
+                "east": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
-                "south": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
+                "south": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
-                "west": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
+                "west": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
-                "up": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
+                "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
-                "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
+                "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
             }
         },
         {
@@ -175,6 +174,127 @@
                 "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": [ 3.0, 8.0, 5.0 ], 
+            "to": [ 5.0, 9.0, 11.0 ], 
+            "rotation": { "origin": [ 5.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 },
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 10.0, 7.0, 11.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "up": { "texture": "#1", "uv": [ 5.0, 7.0, 6.0, 13.0 ], "rotation": 180 },
+                "down": { "texture": "#1", "uv": [ 5.0, 3.0, 11.0, 4.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 11.0, 8.0, 5.0 ], 
+            "to": [ 13.0, 9.0, 11.0 ], 
+            "rotation": { "origin": [ 11.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 },
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 4.0, 8.0, 5.0, 9.0 ] },
+                "east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 11.0, 7.0, 12.0, 8.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "up": { "texture": "#1", "uv": [ 4.0, 5.0, 5.0, 11.0 ], "rotation": 180 },
+                "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 90 }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 5.0, 8.0, 3.0 ], 
+            "to": [ 11.0, 9.0, 5.0 ], 
+            "rotation": { "origin": [ 8.0, 9.0, 5.0 ], "axis": "x", "angle": -45.0 },
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "west": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
+                "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 5.0, 8.0, 11.0 ], 
+            "to": [ 11.0, 9.0, 13.0 ], 
+            "rotation": { "origin": [ 8.0, 9.0, 11.0 ], "axis": "x", "angle": 45.0 },
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
+                "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "west": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] },
+                "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 5.0, 8.0, 5.0 ], 
+            "to": [ 11.0, 9.0, 11.0 ], 
+            "faces": {
+                "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
+                "east": { "texture": "#1", "uv": [ 4.0, 6.0, 5.0, 12.0 ], "rotation": 90 },
+                "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 180 },
+                "west": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 9.0 ], "rotation": 90 },
+                "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] },
+                "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 6.0, 0.0 ], 
+            "to": [ 1.0, 9.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 6.0, 0.0 ], 
+            "to": [ 16.0, 9.0, 1.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 6.0, 15.0 ], 
+            "to": [ 16.0, 9.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 6.0, 15.0 ], 
+            "to": [ 1.0, 9.0, 16.0 ], 
+            "faces": {
+                "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
+                "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
+            }
         }
     ]
 }

src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json

@@ -0,0 +1,89 @@
+{
+    "__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"
+    },
+    "elements": [
+        {
+            "name": "Cube",
+            "from": [ 1.0, 0.0, 1.0 ], 
+            "to": [ 15.0, 15.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 ] }
+            }
+        },
+        {
+            "name": "Outline",
+            "from": [ 0.0, 0.0, 0.0 ], 
+            "to": [ 1.0, 15.0, 1.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 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "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 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 15.0, 0.0, 15.0 ], 
+            "to": [ 16.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 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "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 ] }
+            }
+        },
+        {
+            "name": "Cube",
+            "from": [ 0.0, 15.0, 0.0 ], 
+            "to": [ 16.0, 16.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 ] }
+            }
+        }
+    ]
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation":
+  {
+    "frametime": 3
+  }
+}