diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 2b3634294..910555c46 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -36,6 +36,15 @@ public class BlockCanolaPress extends BlockContainerBase{ this.setSoundType(SoundType.STONE); } + @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/blockCanolaPress.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json index e6e9fd014..b640a6e05 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json @@ -1,11 +1,9 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "actuallyadditions:blockCanolaPress", "textures": { - "side": "actuallyadditions:blocks/blockCanolaPress", - "bottom": "#top", - "top": "actuallyadditions:blocks/blockCanolaPressTop" + "particle": "actuallyadditions:blocks/blockCanolaPress" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockCanolaPress.json b/src/main/resources/assets/actuallyadditions/models/block/blockCanolaPress.json new file mode 100644 index 000000000..1eb04b1ab --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockCanolaPress.json @@ -0,0 +1,165 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockCanolaPress", + "1": "actuallyadditions:blocks/blockCanolaPressTop" + }, + "elements": [ + { + "name": "Cube", + "from": [ 13.0, 0.0, 0.0 ], + "to": [ 16.0, 16.0, 3.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 13.0, 3.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 3.0, 16.0, 3.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 13.0, 3.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 0.0, 13.0 ], + "to": [ 3.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "west": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 13.0, 3.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 13.0, 0.0, 13.0 ], + "to": [ 16.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "west": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 13.0, 3.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 1.0, 1.0 ], + "to": [ 15.0, 7.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 9.0, 15.0, 15.0 ] }, + "east": { "texture": "#0", "uv": [ 1.0, 9.0, 15.0, 15.0 ] }, + "south": { "texture": "#0", "uv": [ 1.0, 9.0, 15.0, 15.0 ] }, + "west": { "texture": "#0", "uv": [ 1.0, 9.0, 15.0, 15.0 ] }, + "up": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 9.0, 1.0 ], + "to": [ 15.0, 15.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 7.0 ] }, + "east": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 7.0 ] }, + "south": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 7.0 ] }, + "west": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 7.0 ] }, + "up": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + }, + { + "name": "Cube", + "from": [ 2.0, 7.0, 2.0 ], + "to": [ 14.0, 9.0, 14.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 2.0, 7.0, 14.0, 9.0 ] }, + "east": { "texture": "#0", "uv": [ 2.0, 7.0, 14.0, 9.0 ] }, + "south": { "texture": "#0", "uv": [ 2.0, 7.0, 14.0, 9.0 ] }, + "west": { "texture": "#0", "uv": [ 2.0, 7.0, 14.0, 9.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": [ 13.0, 0.0, 3.0 ], + "to": [ 15.0, 1.0, 13.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 6.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 3.0, 15.0, 13.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 3.0, 15.0, 13.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 3.0, 16.0, 13.0 ] }, + "up": { "texture": "#1", "uv": [ 14.0, 3.0, 16.0, 13.0 ] }, + "down": { "texture": "#1", "uv": [ 14.0, 3.0, 16.0, 13.0 ] } + } + }, + { + "name": "Cube", + "from": [ 3.0, 0.0, 2.0 ], + "to": [ 13.0, 1.0, 14.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 1.0, 0.0, 13.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 3.0, 16.0, 13.0 ] }, + "up": { "texture": "#1", "uv": [ 3.0, 1.0, 13.0, 13.0 ] }, + "down": { "texture": "#1", "uv": [ 3.0, 1.0, 13.0, 13.0 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 0.0, 3.0 ], + "to": [ 3.0, 1.0, 13.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 6.0, 0.0, 9.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 3.0, 15.0, 13.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 3.0, 15.0, 13.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 3.0, 2.0, 13.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 3.0, 2.0, 13.0 ] } + } + }, + { + "name": "Cube", + "from": [ 3.0, 0.0, 1.0 ], + "to": [ 13.0, 1.0, 2.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 3.0, 0.0, 4.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 12.0, 0.0, 13.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 3.0, 0.0, 14.0 ], + "to": [ 13.0, 1.0, 15.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 3.0, 0.0, 4.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 12.0, 0.0, 13.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 3.0, 0.0, 13.0, 1.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPress.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPress.png index 75726f79d..23480c6e9 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPress.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPress.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPressTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPressTop.png index 17144ed53..7e6a9eed3 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPressTop.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPressTop.png differ