diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index add8d7472..17a078d93 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.RefinedStorageBlocks; +import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkNode; import refinedstorage.tile.TileCable; @@ -22,27 +22,30 @@ public class BlockCable extends BlockNode { public static final PropertyBool UP = PropertyBool.create("up"); public static final PropertyBool DOWN = PropertyBool.create("down"); - public BlockCable() { - super("cable"); + public BlockCable(String name) { + super(name); setHardness(0.6F); } + public BlockCable() { + this("cable"); + } + @Override public TileEntity createTileEntity(World world, IBlockState state) { return new TileCable(); } @Override - protected BlockStateContainer createBlockState() { - return createBlockStateBuilder() + protected BlockStateContainer.Builder createBlockStateBuilder() { + return super.createBlockStateBuilder() .add(NORTH) .add(EAST) .add(SOUTH) .add(WEST) .add(UP) - .add(DOWN) - .build(); + .add(DOWN); } @Override @@ -56,8 +59,10 @@ public class BlockCable extends BlockNode { .withProperty(DOWN, hasConnectionWith(world, pos.down())); } - private boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || world.getTileEntity(pos) instanceof INetworkNode; + public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + + return tile instanceof INetworkMaster || tile instanceof INetworkNode; } @Override diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index fa8c09cc1..0efacdf56 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -2,15 +2,9 @@ package refinedstorage.block; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RefinedStorage; -import refinedstorage.RefinedStorageGui; import refinedstorage.tile.externalstorage.TileExternalStorage; public class BlockExternalStorage extends BlockNode { @@ -23,15 +17,6 @@ public class BlockExternalStorage extends BlockNode { return new TileExternalStorage(); } - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!world.isRemote) { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { super.neighborChanged(state, world, pos, block); diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index aa4b5d4f6..cae887e19 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileImporter; -public class BlockImporter extends BlockNode { +public class BlockImporter extends BlockCable { public BlockImporter() { super("importer"); } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index f1dca21b0..cb09b9b3b 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -14,6 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileNode; import refinedstorage.tile.TileWirelessTransmitter; public class BlockWirelessTransmitter extends BlockNode { @@ -67,7 +68,7 @@ public class BlockWirelessTransmitter extends BlockNode { BlockPos downPos = pos.offset(EnumFacing.DOWN); IBlockState down = world.getBlockState(downPos); - return down.getBlock().canPlaceTorchOnTop(down, world, downPos); + return down.getBlock().canPlaceTorchOnTop(down, world, downPos) || (world.getTileEntity(downPos) instanceof TileNode && !(world.getTileEntity(downPos) instanceof TileWirelessTransmitter)); } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index 7d2edf1b3..d6415b88e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -1,38 +1,81 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/importer" - } + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "line": "refinedstorage:blocks/importer_exporter" + }, + "model": "refinedstorage:cable_core", + "uvlock": true }, "variants": { "inventory": [ { - "y": 0, + "model": "refinedstorage:importer", "transform": "forge:default-block" } ], "direction": { "north": { - "y": 0 + "submodel": "refinedstorage:importer_north" }, "east": { - "y": 90 + "submodel": "refinedstorage:importer_east" }, "south": { - "y": 180 + "submodel": "refinedstorage:importer_south" }, "west": { - "y": 270 + "submodel": "refinedstorage:importer_west" }, "up": { - "x": 270 + "submodel": "refinedstorage:importer_up" }, "down": { - "x": 90 + "submodel": "refinedstorage:importer_down" + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_north" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_east" + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_south" + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_west" + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_up" + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_down" + }, + "false": { } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/importer.json b/src/main/resources/assets/refinedstorage/models/block/importer.json new file mode 100755 index 000000000..8369750a8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer.json @@ -0,0 +1,419 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 4.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + }, + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "East", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 16.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "West", + "from": [ + 0.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_down.json b/src/main/resources/assets/refinedstorage/models/block/importer_down.json new file mode 100755 index 000000000..de37d821f --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_down.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 4.0, + 6.0 + ], + "to": [ + 10.0, + 6.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 2.0, + 5.0 + ], + "to": [ + 11.0, + 4.0, + 11.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 0.0, + 3.0 + ], + "to": [ + 13.0, + 2.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_east.json b/src/main/resources/assets/refinedstorage/models/block/importer_east.json new file mode 100755 index 000000000..1db248799 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_east.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 12.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 12.0, + 5.0, + 5.0 + ], + "to": [ + 14.0, + 11.0, + 11.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 14.0, + 3.0, + 3.0 + ], + "to": [ + 16.0, + 13.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_north.json b/src/main/resources/assets/refinedstorage/models/block/importer_north.json new file mode 100755 index 000000000..b1e2236ed --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_north.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 4.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_south.json b/src/main/resources/assets/refinedstorage/models/block/importer_south.json new file mode 100755 index 000000000..b75805235 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_south.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 10.0 + ], + "to": [ + 10.0, + 10.0, + 12.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 12.0 + ], + "to": [ + 11.0, + 11.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 14.0 + ], + "to": [ + 13.0, + 13.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_up.json b/src/main/resources/assets/refinedstorage/models/block/importer_up.json new file mode 100755 index 000000000..78a01c181 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_up.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 10.0, + 6.0 + ], + "to": [ + 10.0, + 12.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 12.0, + 5.0 + ], + "to": [ + 11.0, + 14.0, + 11.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 14.0, + 3.0 + ], + "to": [ + 13.0, + 16.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_west.json b/src/main/resources/assets/refinedstorage/models/block/importer_west.json new file mode 100755 index 000000000..a1640073e --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_west.json @@ -0,0 +1,214 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 4.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 2.0, + 5.0, + 5.0 + ], + "to": [ + 4.0, + 11.0, + 11.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 0.0, + 3.0, + 3.0 + ], + "to": [ + 2.0, + 13.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/exporter.png b/src/main/resources/assets/refinedstorage/textures/blocks/exporter.png deleted file mode 100644 index 1dce03344..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/exporter.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png deleted file mode 100644 index 4e20b443f..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer.png deleted file mode 100644 index d868b6e9e..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/importer.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter.png new file mode 100644 index 000000000..a0c07decf Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter.png differ