From 8d93592217b15acd8f62c58a3bc9e01238cd3e5a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Dec 2015 22:42:40 +0100 Subject: [PATCH] wireless transmitter texture --- .../block/BlockWirelessTransmitter.java | 24 ++++++++ .../java/storagecraft/proxy/ClientProxy.java | 1 + .../blockstates/wireless_transmitter.json | 55 ++++++++++++++++++ ...ansmitter.png => wireless_transmitter.png} | Bin ...Side.png => wireless_transmitter_side.png} | Bin ... => wireless_transmitter_side_working.png} | Bin ...g.png => wireless_transmitter_working.png} | Bin 7 files changed, 80 insertions(+) create mode 100755 src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json rename src/main/resources/assets/storagecraft/textures/blocks/{wirelessTransmitter.png => wireless_transmitter.png} (100%) rename src/main/resources/assets/storagecraft/textures/blocks/{wirelessTransmitterSide.png => wireless_transmitter_side.png} (100%) rename src/main/resources/assets/storagecraft/textures/blocks/{wirelessTransmitterSideWorking.png => wireless_transmitter_side_working.png} (100%) rename src/main/resources/assets/storagecraft/textures/blocks/{wirelessTransmitterWorking.png => wireless_transmitter_working.png} (100%) diff --git a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java index 0bf2f3373..a8275841e 100755 --- a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java +++ b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java @@ -1,10 +1,14 @@ package storagecraft.block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; @@ -13,11 +17,31 @@ import storagecraft.tile.TileWirelessTransmitter; // @TODO: This texture behaves differently public class BlockWirelessTransmitter extends BlockMachine { + public static final PropertyBool WORKING = PropertyBool.create("working"); + public BlockWirelessTransmitter() { super("wireless_transmitter"); } + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] + { + DIRECTION, + CONNECTED, + WORKING + }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) + { + return super.getActualState(state, world, pos) + .withProperty(WORKING, ((TileWirelessTransmitter) world.getTileEntity(pos)).isWorking()); + } + @Override public TileEntity createTileEntity(World world, IBlockState state) { diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index c7f7af9e2..fdc39874d 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -113,5 +113,6 @@ public class ClientProxy extends CommonProxy mesher.register(Item.getItemFromBlock(StorageCraftBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("storagecraft:constructor", "inventory")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.DESTRUCTOR), 0, new ModelResourceLocation("storagecraft:destructor", "inventory")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.SOLDERER), 0, new ModelResourceLocation("storagecraft:solderer", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("storagecraft:wireless_transmitter", "inventory")); } } diff --git a/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json b/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json new file mode 100755 index 000000000..a33577ac8 --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json @@ -0,0 +1,55 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "storagecraft:blocks/wireless_transmitter_side", + "top": "storagecraft:blocks/wireless_transmitter_side", + "front": "storagecraft:blocks/wireless_transmitter" + } + }, + "variants": { + "inventory": [ + { + "y": 0 + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + }, + "working": { + "true": { + "textures": { + "side": "storagecraft:blocks/wireless_transmitter_side_working", + "top": "storagecraft:blocks/wireless_transmitter_side_working", + "front": "storagecraft:blocks/wireless_transmitter_working" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitter.png b/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitter.png rename to src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterSide.png b/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterSide.png rename to src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterSideWorking.png b/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side_working.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterSideWorking.png rename to src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side_working.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterWorking.png b/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_working.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wirelessTransmitterWorking.png rename to src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_working.png