From b4fe9164c3707151b1290ba3d8d3c2c7f6525357 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 26 Sep 2016 21:19:33 +0200 Subject: [PATCH] Disk Manipulator now has a front texture and connected state --- .../block/BlockDiskManipulator.java | 7 +++- .../tile/TileDiskManipulator.java | 5 +++ .../blockstates/disk_manipulator.json | 41 ++++++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/main/java/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/refinedstorage/block/BlockDiskManipulator.java index e8f1d5933..ce078fce8 100755 --- a/src/main/java/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/refinedstorage/block/BlockDiskManipulator.java @@ -40,8 +40,13 @@ public class BlockDiskManipulator extends BlockNode { super.breakBlock(world, pos, state); } + @Override + public boolean hasConnectivityState() { + return true; + } + @Override public EnumPlacementType getPlacementType() { - return null; + return EnumPlacementType.HORIZONTAL; } } diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/refinedstorage/tile/TileDiskManipulator.java index db2187b8d..64d535041 100755 --- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/refinedstorage/tile/TileDiskManipulator.java @@ -167,6 +167,11 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte return RefinedStorage.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage(); } + @Override + public boolean hasConnectivityState() { + return true; + } + @Override public void updateNode() { if (ticks % upgrades.getSpeed() != 0) { diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json index 692c33f7b..55d47d6a8 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json @@ -1,25 +1,44 @@ { "forge_marker": 1, "defaults": { - "model": "cube", + "model": "orientable", "textures": { - "particle": "refinedstorage:blocks/disk_manipulator", - "down": "refinedstorage:blocks/side", - "up": "refinedstorage:blocks/side", - "north": "refinedstorage:blocks/disk_manipulator", - "east": "refinedstorage:blocks/disk_manipulator", - "south": "refinedstorage:blocks/disk_manipulator", - "west": "refinedstorage:blocks/disk_manipulator" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/disk_manipulator" } }, "variants": { "inventory": [ { - "transform": "forge:default-block" + "y": 0 } ], - "normal": { - "model": "cube" + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } } } } \ No newline at end of file