From 113220b3504ff92c9a6fbb50306036f041fd73d7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 15 Dec 2015 22:44:42 +0100 Subject: [PATCH] add icons for some blocks and items --- .../java/storagecraft/block/BlockDrive.java | 32 ++++++++++++++++++ .../java/storagecraft/block/BlockGrid.java | 12 +++---- .../storagecraft/block/BlockStorageProxy.java | 32 ++++++++++++++++++ .../storagecraft/item/ItemStorageCell.java | 16 +++++++++ .../storagecraft/textures/blocks/drive.png | Bin 0 -> 274 bytes .../textures/blocks/storageProxy.png | Bin 0 -> 248 bytes .../textures/items/storageCell.png | Bin 393 -> 0 bytes .../textures/items/storageCell0.png | Bin 0 -> 224 bytes .../textures/items/storageCell1.png | Bin 0 -> 227 bytes .../textures/items/storageCell2.png | Bin 0 -> 238 bytes .../textures/items/storageCell3.png | Bin 0 -> 234 bytes .../textures/items/storageCell4.png | Bin 0 -> 372 bytes 12 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/storagecraft/textures/blocks/drive.png create mode 100644 src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png delete mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell.png create mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell0.png create mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell1.png create mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell2.png create mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell3.png create mode 100644 src/main/resources/assets/storagecraft/textures/items/storageCell4.png diff --git a/src/main/java/storagecraft/block/BlockDrive.java b/src/main/java/storagecraft/block/BlockDrive.java index a364edd80..834f288ea 100644 --- a/src/main/java/storagecraft/block/BlockDrive.java +++ b/src/main/java/storagecraft/block/BlockDrive.java @@ -1,13 +1,19 @@ package storagecraft.block; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import storagecraft.SC; import storagecraft.tile.TileDrive; public class BlockDrive extends BlockSC implements ITileEntityProvider { + private IIcon frontIcon; + private IIcon sideIcon; + public BlockDrive() { super("drive"); } @@ -25,4 +31,30 @@ public class BlockDrive extends BlockSC implements ITileEntityProvider { public TileEntity createNewTileEntity(World world, int meta) { return new TileDrive(); } + + @Override + public void registerBlockIcons(IIconRegister register) { + frontIcon = register.registerIcon("storagecraft:drive"); + sideIcon = register.registerIcon("storagecraft:generic"); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileDrive tile = (TileDrive) world.getTileEntity(x, y, z); + + if (side == tile.getDirection().getOpposite().ordinal()) { + return frontIcon; + } + + return sideIcon; + } + + @Override + public IIcon getIcon(int side, int meta) { + if (side == 3) { + return frontIcon; + } + + return sideIcon; + } } diff --git a/src/main/java/storagecraft/block/BlockGrid.java b/src/main/java/storagecraft/block/BlockGrid.java index 0453411e2..ae522b5a8 100644 --- a/src/main/java/storagecraft/block/BlockGrid.java +++ b/src/main/java/storagecraft/block/BlockGrid.java @@ -12,8 +12,8 @@ import storagecraft.tile.TileGrid; public class BlockGrid extends BlockSC implements ITileEntityProvider { private IIcon sideIcon; - private IIcon iconConnected; - private IIcon iconDisconnected; + private IIcon connectedIcon; + private IIcon disconnectedIcon; public BlockGrid() { super("grid"); @@ -35,8 +35,8 @@ public class BlockGrid extends BlockSC implements ITileEntityProvider { @Override public void registerBlockIcons(IIconRegister register) { - iconConnected = register.registerIcon("storagecraft:gridConnected"); - iconDisconnected = register.registerIcon("storagecraft:gridDisconnected"); + connectedIcon = register.registerIcon("storagecraft:gridConnected"); + disconnectedIcon = register.registerIcon("storagecraft:gridDisconnected"); sideIcon = register.registerIcon("storagecraft:generic"); } @@ -45,7 +45,7 @@ public class BlockGrid extends BlockSC implements ITileEntityProvider { TileGrid tile = (TileGrid) world.getTileEntity(x, y, z); if (side == tile.getDirection().getOpposite().ordinal()) { - return tile.isConnected() ? iconConnected : iconDisconnected; + return tile.isConnected() ? connectedIcon : disconnectedIcon; } return sideIcon; @@ -54,7 +54,7 @@ public class BlockGrid extends BlockSC implements ITileEntityProvider { @Override public IIcon getIcon(int side, int meta) { if (side == 3) { - return iconDisconnected; + return disconnectedIcon; } return sideIcon; diff --git a/src/main/java/storagecraft/block/BlockStorageProxy.java b/src/main/java/storagecraft/block/BlockStorageProxy.java index ada2425a2..900f64d31 100644 --- a/src/main/java/storagecraft/block/BlockStorageProxy.java +++ b/src/main/java/storagecraft/block/BlockStorageProxy.java @@ -1,11 +1,17 @@ package storagecraft.block; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import storagecraft.tile.TileStorageProxy; public class BlockStorageProxy extends BlockSC implements ITileEntityProvider { + private IIcon frontIcon; + private IIcon sideIcon; + public BlockStorageProxy() { super("storageProxy"); } @@ -14,4 +20,30 @@ public class BlockStorageProxy extends BlockSC implements ITileEntityProvider { public TileEntity createNewTileEntity(World world, int meta) { return new TileStorageProxy(); } + + @Override + public void registerBlockIcons(IIconRegister register) { + frontIcon = register.registerIcon("storagecraft:storageProxy"); + sideIcon = register.registerIcon("storagecraft:generic"); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileStorageProxy tile = (TileStorageProxy) world.getTileEntity(x, y, z); + + if (side == tile.getDirection().getOpposite().ordinal()) { + return frontIcon; + } + + return sideIcon; + } + + @Override + public IIcon getIcon(int side, int meta) { + if (side == 3) { + return frontIcon; + } + + return sideIcon; + } } diff --git a/src/main/java/storagecraft/item/ItemStorageCell.java b/src/main/java/storagecraft/item/ItemStorageCell.java index 198ae50f4..cdb238e54 100644 --- a/src/main/java/storagecraft/item/ItemStorageCell.java +++ b/src/main/java/storagecraft/item/ItemStorageCell.java @@ -1,15 +1,19 @@ package storagecraft.item; import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import storagecraft.storage.CellStorage; public class ItemStorageCell extends ItemSC { + private IIcon[] icons = new IIcon[5]; + public ItemStorageCell() { super("storageCell"); @@ -40,4 +44,16 @@ public class ItemStorageCell extends ItemSC { CellStorage.init(stack); } + + @Override + public void registerIcons(IIconRegister register) { + for (int i = 0; i < 5; ++i) { + icons[i] = register.registerIcon("storagecraft:storageCell" + i); + } + } + + @Override + public IIcon getIconFromDamage(int damage) { + return icons[damage]; + } } diff --git a/src/main/resources/assets/storagecraft/textures/blocks/drive.png b/src/main/resources/assets/storagecraft/textures/blocks/drive.png new file mode 100644 index 0000000000000000000000000000000000000000..80e45906c0896f729d71171b51dcd1e6a4a7001d GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdS-umlJ5i6G<&)@hIn|ty=2JOV8GG(kT34Q#ordiT;aC6!dGzb5y&ZA$j5uqd_vm? zeO>E|0rjkXuX)U~7hE}d&^o*HL5O+7%?pe+Qj!l8nT@0q8QI_O`M0kv_^rbNo|-K7 ztevu(Hd_{~l0K00fk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdS-umlJ5i6WO}+dhIn|tJ?qGIK!L~QqTIUIa}MQJ|4(hb*|O1PVXq+Po>rb$_I`rl zo0*>OtDD}q?k)3;;}<`3RhKjz3;)KS%~FuJ)!g)rk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdS-umlJ5i6{PJ{h4Ds-OJMlK(Ap;)g@Bi&>H>H~9J=%6rBHy~}K&hTv((V6eq&GZS z*pO@O^)aL2REC(^l?zO3R@}Y(X!p9*h0+Hc@@ko%B`~z#IJkV#*5ktL5AVc$37Dtp}@E-?p39?~>n@vuXW; zh67ofPyFa&|B?TtXjAfrcarQ9H5^P*{>{<0AMXmTv$)hab5|?FJ@X~Z2mhTkIq-37 lLF?HE5rVA^(h6z!?Vq{z{}r#6k_3hVgQu&X%Q~loCIDWIq+NS%G}c0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GyBt%d>^PL&eO#) zB*Oh|-$vd820Vw0VxIr`-+O!ENS%G}c0*}aI z1_r)^Ak4U9V)k30phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7ip4p$C=2@IW|lq#e>Ib!CKj!OG;3#*m> zB#Q4+fAq6r?Nu&D76Ata2=SlWqV-+phxXVP_q>;EH0qq{x#mn@GV_J)of6jtJu`up OF?hQAxvXNS%G}c0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GyBt%d>^PL$J50z zB*Oh|pCi`+0}htYt^Za&|MTB`n-{;=_Y5;FDyt%d_5S3m=k$N~mdjR$)gLXlNiH-I!Qc#`;-(fax%j@q~9 Rjsxvw@O1TaS?83{1OPJTQ5XOK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell3.png b/src/main/resources/assets/storagecraft/textures/items/storageCell3.png new file mode 100644 index 0000000000000000000000000000000000000000..563c0e5da14da236a03098ccb8068cc663096494 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GyBt%d>^PL!_&nv zB*Ojexr3Ys40xCw_^+3Lo4-hV$FVPo!M3ukO>*iRJRF|Ab3ZtVbDGbFlwZ@z-19^t zw<<66pRBaHY{~bBTd!&GUSL3=ANLz_fifyzGJ{gC_6aAPWbsyu__V{ebEy`4L+^w| QKsy;cUHx3vIVCg!02)V6umAu6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell4.png b/src/main/resources/assets/storagecraft/textures/items/storageCell4.png new file mode 100644 index 0000000000000000000000000000000000000000..d7946e064ac35b381ff2048723fa47c37ea9bdf2 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GyBt%d>^Rhlc$Sg zNQC>_KF2O*M;_+q(!b}=`TYO>87V>YX~8@aYO-SA0+>3tT{&JkFP`=A+=Ly%JmsI{ zxYkjuGFso&%8Q;;a)pXVD)3g8-h`W%Io@~?Gj6YN;o7I z<#?5Su{CBorZIbxZ0-4;2E$X!QrzzwD<|}9(!6=`J5b4D5|mskJgvT_??RU(qx0(u zjxvxH7TcN_E98N;KKQ}+&)(qQf#V!&X9$**s4o;XzRv)0`}ab*{e9LeW)z&W{R{Lx NgQu&X%Q~loCIFtbkn8{e literal 0 HcmV?d00001