From 159ede2b92f4f3b9f2c2a49df8157a7cbce569bd Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sat, 13 Sep 2014 18:42:35 -0400 Subject: [PATCH] Cleaning up lots of loose ends. New comp drawers look. --- .../assets/storagedrawers/lang/en_US.lang | 17 ++-- .../textures/blocks/drawers_comp_front_0.png | Bin 0 -> 597 bytes .../blocks/drawers_comp_front_0_ind.png | Bin 0 -> 610 bytes .../textures/blocks/drawers_comp_front_1.png | Bin 0 -> 595 bytes .../blocks/drawers_comp_front_1_ind.png | Bin 0 -> 605 bytes .../textures/blocks/drawers_comp_front_2.png | Bin 0 -> 554 bytes .../blocks/drawers_comp_front_2_ind.png | Bin 0 -> 562 bytes .../textures/blocks/drawers_comp_side.png | Bin 0 -> 490 bytes .../textures/blocks/drawers_comp_side_2.png | Bin 0 -> 599 bytes .../textures/items/upgrade_status_level1.png | Bin 0 -> 438 bytes ...ndicator.png => upgrade_status_level2.png} | Bin .../textures/items/upgrade_status_level3.png | Bin 0 -> 483 bytes .../block/BlockCompDrawers.java | 61 ++++++++++----- .../storagedrawers/block/BlockDrawers.java | 11 +++ .../block/tile/TileEntityDrawersBase.java | 16 ++++ .../client/renderer/DrawersRenderer.java | 14 ++-- .../storagedrawers/core/ModItems.java | 10 +++ .../storagedrawers/core/ModRecipes.java | 30 +++++-- .../storagedrawers/item/ItemUpgrade.java | 3 +- .../item/ItemUpgradeStatus.java | 73 ++++++++++++++++++ 20 files changed, 200 insertions(+), 35 deletions(-) create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_0.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_0_ind.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1_ind.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2_ind.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_side_2.png create mode 100644 resources/assets/storagedrawers/textures/items/upgrade_status_level1.png rename resources/assets/storagedrawers/textures/items/{upgrade_indicator.png => upgrade_status_level2.png} (100%) create mode 100644 resources/assets/storagedrawers/textures/items/upgrade_status_level3.png create mode 100644 src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java diff --git a/resources/assets/storagedrawers/lang/en_US.lang b/resources/assets/storagedrawers/lang/en_US.lang index fbfb4bb..65a90d2 100644 --- a/resources/assets/storagedrawers/lang/en_US.lang +++ b/resources/assets/storagedrawers/lang/en_US.lang @@ -1,11 +1,18 @@ itemGroup.storageDrawers=Storage Drawers # Items -item.upgrade.iron.name=Drawer Upgrade (II) -item.upgrade.gold.name=Drawer Upgrade (III) -item.upgrade.obsidian.name=Drawer Upgrade (IV) -item.upgrade.diamond.name=Drawer Upgrade (V) -item.upgrade.emerald.name=Drawer Upgrade (VI) +item.upgradeTemplate.name=Upgrade Template +item.upgrade.iron.name=Storage Upgrade (II) +item.upgrade.gold.name=Storage Upgrade (III) +item.upgrade.obsidian.name=Storage Upgrade (IV) +item.upgrade.diamond.name=Storage Upgrade (V) +item.upgrade.emerald.name=Storage Upgrade (VI) +item.upgradeStatus.level1.name=Status Upgrade (I) +item.upgradeStatus.level1.description=Shows full storage +item.upgradeStatus.level2.name=Status Upgrade (II) +item.upgradeStatus.level2.description=Shows near-full storage +item.upgradeStatus.level3.name=Status Upgrade (III) +item.upgradeStatus.level3.description=Shows fill level # Blocks tile.fullDrawers2.oak.name=Oak Drawers 1x2 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_0.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_0.png new file mode 100644 index 0000000000000000000000000000000000000000..22d883a09c1066dae28d70427f606d53d7552109 GIT binary patch literal 597 zcmV-b0;>IqP)WdKuQbRaP^AX8;WdKuQbRaP^AX8;|!Hv)jA_f#YwkSq} zL*fwA6+ejRru!|vm3sB7@}6NzrIN1egplj?3Sbxp03KCU4F-eytu#$Lolah__j0-L z=+$bq<#I`GgKZ&h2)ShXT(- zhxy<~L+(wOY72o6USaUnCMidpI0o zEgZ*Tt%t)wmSw-+kIgcLLIGF*{#S5;KmgJCe7;htWHK4_CX>m>VDPh82=8W<%jI-B z4GT$<5NNJ78jZHw?cHt%*XeXxEEb6<@~rX7_xpWwt=VjrQV30@Qn6U<+h8xc{>t}y zJ(jND<#K^tuh#$=Ng+B**jFA5hg|%KqL@e|!r^eI)4{s5uTOyn|&b$%K(K^@+#O%zr=cU&dfdX#wUOzW@LL07*qoM6N<$g3v?>nE(I) literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a26b7d061728155702729cfd9ad92b032799c0a4 GIT binary patch literal 595 zcmV-Z0<8UsP)WdKuQbRaP^AX8;+4%&vf{mqC0YL=uem6$X z7v~@r7H5jhzq9}RGy8A!TCL_dj;3jk#{=+uJ^^gc=W{BRa$a${TyD2pEEc=p?~1c# zv$={T@KpeueNNk%;yY7dEcM=+_^85Y4VDM8$RG~`qcLo|Bx))e3m%Uz(%GqodkH<5a49Ann1Y0~F54N68 zr`2keNF;DpuU4y+{{JZypL)HXPN!iow9L@$cIh0AMvKK_rBWe38jXg-A!OH9UDvbO ztjsNbgE6CAF8BNW!{NYoI-Q!PNttUaVnUS{WdKIvN`*o}s0iotc|>XQBlZhbns6l^ z2o<*Ba2WP_y#|PxuB~FQ1eLqp4&zCV$7AHtCeLh)^k*xjGPiUPfG`6<%H?t-0TjEo he*L{M9w)y3-oJQCObs?3bq)Xk002ovPDHLkV1i1D^*8_k literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1_ind.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_1_ind.png new file mode 100644 index 0000000000000000000000000000000000000000..0358e70f737971908bf395606f332a9c5d991295 GIT binary patch literal 605 zcmV-j0;2tiP)WdKuQbRaP^AX8;Pa84jFC|h`e4eEa&-rMnRfUfamim(*Vfs_q!Pig`~mpcm%*c-yyn4B%*!=yorwc z(NBhaq%sZuLn7le{eFKi82sHvx+0a~9|jp7x))fl*ZqE<%Ee+4i^VdT4C(1~iY*?G z2U{+46UWTR0kl`54A{CGSbjYf!F zTea4?Tu$~Dzdc%;hLg=^2ZO=sbRspM&ug_BWv;DUL!|OWS-@}%%eITfqDX06C=_VQ z5JT)2sSM#tdu1ES;58f$quy?}05Q|GRScG(@^Co3v{H_mOeVCaH$1zs(qCICW$(`f r*DhsPO0xi>d_E5epxCwbe}C^kX^ut*H|PZD00000NkvXXu0mjfxZ(Vh literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..895a5b618b5aa9072d0a64ac60a320d1df98e386 GIT binary patch literal 554 zcmV+_0@eMAP)WdKuQbRaP^AX8;H5Tg0W2hLCsw6H~7s9zYB{oleBeTl5u-j6@>DB@|W8r|YDV z6NB>)c30P4|82E)uh)yB$g-^G^9gvpUI1Q$AgI^tQ5@In^?tusDwW6MVYnNOMw`vX zii5k!WFoxZ@5kdYAfL~3x~}Vao;e&2s5_kw6lJp6>~J^)uh;8FqXAehm&);dpXP=@ zl*wdZInU=a3a)7d2*Xg_0LX5)n<*BHDsVcT0I*>k(v?aj>m%R|I`*TUnj}(ngHK3g zoF=`^-pE|=YI=Qs|| z+TCuK)c=19!=vBtH=9iq46PYvvl*QSgTWtuI-S04wQalIZfkD&4aN-dB4OaMHN|EW zlN-8V07haZ_=IFncq|MA#1go%uG>91}n%s9*_r`cO{`!0W0A!~*bNKwsr~m)}07*qoM6N<$f&lR92LJ#7 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2_ind.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_front_2_ind.png new file mode 100644 index 0000000000000000000000000000000000000000..5d4768575787e482141e83a93ee19eb950e2fa28 GIT binary patch literal 562 zcmV-20?qx2P)WdKuQbRaP^AX8;R9(o>4OudE4CYu=jgoelnTR;B#I&uzTR%Pdc7XJ;(otBpU+aM$)!PPN#!Jn{+xo7!1g_+ij!KAX%^1a%Z_* zGTaiFQmGUw=jC$2L77n`p6AIl5^Rsh!{+mOX>dNDNl?94h_6s6sJB43_}GtrG91cDpU_7T%85)YE@~07*qoM6N<$f&v8e AX#fBK literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_side.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_side.png new file mode 100644 index 0000000000000000000000000000000000000000..0afb826e85054e05823e02b79a533dcfbe9a23a6 GIT binary patch literal 490 zcmVWdKuQbRaP^AX8;uq+D!$FA!xm&>%_^?D7%a5|md@3*1$csw{0Q1CWHQDl#bK^TU4 zo|~$w>bkz&Zlt(IR^=o~nx+YYz)}=N!Egii`@IT$+qRA4m@@Pn$8ppJf-KAWzBiQ5 z=QADfY3{he&hh^6d_Kt=`pUArUauNrTQyBGl+?ECK61%Ith6%xXAT}3x(|ng%dOp9 z4^)!TtF5?%1{O%u)OE%c0O0j~-#~+W`XCcGd=g;&QNWKQxx-dOTe4(>n)otV87OG` z+6uRIUA7Qg>GsE=_G_y<*9LkKZeHH(uod}Q20g(Bc?I;wl*F6WR`%g4e^E^CgZp`l g$Kw&*{(qnM2L`DaiZUvZ$N&HU07*qoM6N<$f?aFOL;wH) literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_side_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_side_2.png new file mode 100644 index 0000000000000000000000000000000000000000..fae42dd184f6111fb4ac1830b715559fec188cc6 GIT binary patch literal 599 zcmV-d0;v6oP)WdKuQbRaP^AX8;#}%u z=VT+NJ5y}lxxF*ad3dX!%Z@=GHhr{7`JXWh!LbMT;bSM-$olYK)$E6q!hYVMk&*vjC9*=1t zl*{Exr4sa$$z-?N8HN!KhZ~JXDwVq3ZYmfI#^Z4as3t0WaPzIzYRmzQMkBy{K7TwO z203WpV;Oe=3=DJ6-XBu4Ij|ucL=XS~002ovPDHLkV1g1U^br66 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/items/upgrade_status_level1.png b/resources/assets/storagedrawers/textures/items/upgrade_status_level1.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfbff6b68126534f9b2e9ef52cc51d02d7a3681 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv2~x zrKt)=W(tm_=?X>$h9(L|hE^ssB(x(22O2G$PuOM&{>OFVsD+3#`kin4KS|KSt> z6yhxKh%9Dc;1&X5#!GkW{s0A8(j9#r85lP9bN@+XWnf_B^>lFzskoJ#AQALHpZRdT zfLiqD|I!Y3`m;EcJ5KNzvT+v_Zfs<=jEs=HSNDtSd9%ayMUQ!W{x4^al;rs@At^ay zVO3;;ROuBLi4<3tgI%-J-n3`?@LXiPd|Tbcu)-+KC@1Me3P($pTVdn&UaN?P=4NJ} z|35x5ALU-Zzb4J1^r7V8FQ(~|6OTUBYsh42Jf0u7ID>7ckC;Y%>uX-O8ygZXvwY_A zk-6)zhOJ=^d%CfWGv|T)`*jb^8I~M4FVdQ&MBb@0KQF|L;wH) literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/items/upgrade_indicator.png b/resources/assets/storagedrawers/textures/items/upgrade_status_level2.png similarity index 100% rename from resources/assets/storagedrawers/textures/items/upgrade_indicator.png rename to resources/assets/storagedrawers/textures/items/upgrade_status_level2.png diff --git a/resources/assets/storagedrawers/textures/items/upgrade_status_level3.png b/resources/assets/storagedrawers/textures/items/upgrade_status_level3.png new file mode 100644 index 0000000000000000000000000000000000000000..4571eae62fb2fce0b2ad3d15eff95b7b8898605d GIT binary patch literal 483 zcmV<90UZ8`P)WdKxlWgs#(AVGC!ATls9G$1lDIy5pmGczD9Ff}kRJ3!xc00007bV*G` z2i^${6$cR{hPwR#000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003x zNklI; z_S085ziZKPhD|{FNSq~@4Fb$iy(}<|I%*;evLd2j$)*|m;Wq5QaG!zc1_MLDb_NE& z!sB2z1Caf{2AsO^ z3@&(z;Tb#tLEziBUpQll1*X8vKniR#$nRYXj>8oshUmauwRX=%>;`~rgE<@IZ 0) - return iconFront[2][meta]; + return iconFront[2]; else if (tile.getItemStackSize(1) > 0) - return iconFront[1][meta]; + return iconFront[1]; else - return iconFront[0][meta]; + return iconFront[0]; } - return super.getIcon(blockAccess, x, y, z, side); + switch (side) { + case 0: + case 1: + return iconSide; + default: + return iconSideEtched; + } } @Override public void registerBlockIcons (IIconRegister register) { super.registerBlockIcons(register); - String[] subtex = BlockWood.field_150096_a; - iconFront = new IIcon[3][subtex.length]; + iconFront = new IIcon[3]; + iconFrontInd = new IIcon[3]; - for (int i = 0; i < subtex.length; i++) { - iconFront[0][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_0"); - iconFront[1][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_1"); - iconFront[2][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_2"); + for (int i = 0; i < 3; i++) { + iconFront[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i); + iconFrontInd[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind"); } + + iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side"); + iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2"); } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 31c082b..c739924 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -175,6 +175,17 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } + return true; + } + else if (item.getItem() == ModItems.upgradeStatus) { + tileDrawers.setStatusLevel(item.getItemDamage()); + world.markBlockForUpdate(x, y, z); + + if (player != null && !player.capabilities.isCreativeMode) { + if (--item.stackSize <= 0) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + } + return true; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java index b7ec16c..d4af6c1 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java @@ -15,6 +15,7 @@ public abstract class TileEntityDrawersBase extends TileEntity private int direction; private int drawerCapacity = 1; private int level = 1; + private int statusLevel = 0; protected int[] autoSides = new int[] { 0, 1 }; @@ -35,6 +36,14 @@ public abstract class TileEntityDrawersBase extends TileEntity this.level = MathHelper.clamp_int(level, 1, 6); } + public int getStatusLevel () { + return statusLevel; + } + + public void setStatusLevel (int level) { + this.statusLevel = MathHelper.clamp_int(level, 1, 3); + } + public int getDrawerCapacity () { return drawerCapacity; } @@ -65,6 +74,10 @@ public abstract class TileEntityDrawersBase extends TileEntity drawerCapacity = tag.getByte("Cap"); level = tag.getByte("Lev"); + statusLevel = 0; + if (tag.hasKey("Stat")) + statusLevel = tag.getByte("Stat"); + autoSides = new int[] { 0, 1, ForgeDirection.OPPOSITES[direction] }; } @@ -75,6 +88,9 @@ public abstract class TileEntityDrawersBase extends TileEntity tag.setByte("Dir", (byte)direction); tag.setByte("Cap", (byte)drawerCapacity); tag.setByte("Lev", (byte)level); + + if (statusLevel > 0) + tag.setByte("Stat", (byte)statusLevel); } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index 3de545e..09b05e7 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -108,7 +108,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG); }*/ - renderHandleIndicator(block, x, y, z, side, renderer); + if (StorageDrawers.config.cache.enableIndicatorUpgrades) + renderHandleIndicator(block, x, y, z, side, renderer, tile.getStatusLevel()); /*boxRenderer.renderExterior(renderer, block, x, y, z, unit * 14, unit * 14, unit * 15, unit * 15, unit * 15, unit * 16, 0, ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_ZNEG); @@ -149,8 +150,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler private static final float[] indicatorsY2 = new float[] { 14, 6 }; private static final float[] indicatorsY4 = new float[] { 14, 6, 14, 6 }; - private void renderHandleIndicator (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { - if (side < 2 || side > 5) + private void renderHandleIndicator (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, int level) { + if (level <= 0 || side < 2 || side > 5) return; TileEntityDrawersBase tile = block.getTileEntity(renderer.blockAccess, x, y, z); @@ -180,8 +181,11 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler return; for (int i = 0; i < count; i++) { - int iconIndex = (tile.getItemCapacity(i) > 0 && tile.getItemCount(i) == tile.getItemCapacity(i)) ? 2 - : (tile.getItemCapacity(i) > 0 && (float)tile.getItemCount(i) / tile.getItemCapacity(i) > .75) ? 1 : 0; + int iconIndex = 0; + if (level == 2) + iconIndex = (tile.getItemCapacity(i) > 0 && (float)tile.getItemCount(i) / tile.getItemCapacity(i) > .75) ? 1 : iconIndex; + if (level >= 1) + iconIndex = (tile.getItemCapacity(i) > 0 && tile.getItemCount(i) == tile.getItemCapacity(i)) ? 2 : iconIndex; boxRenderer.setExteriorIcon(block.getIndicatorIcon(iconIndex)); boxRenderer.renderExterior(renderer, block, x, y, z, indX[xi][d][i] * unit, indY[i] * unit, indX[zi][d][i] * unit, diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModItems.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModItems.java index 07fc61c..e60c6e4 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/core/ModItems.java +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModItems.java @@ -2,16 +2,26 @@ package com.jaquadro.minecraft.storagedrawers.core; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; +import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; public class ModItems { + public static Item upgradeTemplate; public static ItemUpgrade upgrade; + public static ItemUpgradeStatus upgradeStatus; public void init () { + upgradeTemplate = new Item().setUnlocalizedName("upgradeTemplate").setTextureName(StorageDrawers.MOD_ID + ":upgrade_template").setCreativeTab(ModCreativeTabs.tabStorageDrawers); upgrade = new ItemUpgrade("upgrade"); + upgradeStatus = new ItemUpgradeStatus("upgradeStatus"); + + GameRegistry.registerItem(upgradeTemplate, "upgradeTemplate"); if (StorageDrawers.config.cache.enableStorageUpgrades) GameRegistry.registerItem(upgrade, "upgrade"); + if (StorageDrawers.config.cache.enableIndicatorUpgrades) + GameRegistry.registerItem(upgradeStatus, "upgradeStatus"); } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java index c184a24..26bbd8a 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -1,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.core; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.BlockWood; import net.minecraft.init.Blocks; @@ -21,15 +22,34 @@ public class ModRecipes 'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest); } + GameRegistry.addRecipe(new ItemStack(ModBlocks.compDrawers), "xxx", "zwz", "xyx", + 'x', new ItemStack(Blocks.stone), 'y', Items.iron_ingot, 'z', new ItemStack(Blocks.piston), 'w', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", + 'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", + 'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", + 'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", + 'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 2), "xyx", "yzy", "xyx", - 'x', Items.iron_ingot, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + 'x', Items.iron_ingot, 'y', Items.stick, 'z', ModItems.upgradeTemplate); GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 3), "xyx", "yzy", "xyx", - 'x', Items.gold_ingot, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + 'x', Items.gold_ingot, 'y', Items.stick, 'z', ModItems.upgradeTemplate); GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 4), "xyx", "yzy", "xyx", - 'x', Blocks.obsidian, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + 'x', Blocks.obsidian, 'y', Items.stick, 'z', ModItems.upgradeTemplate); GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 5), "xyx", "yzy", "xyx", - 'x', Items.diamond, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + 'x', Items.diamond, 'y', Items.stick, 'z', ModItems.upgradeTemplate); GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 6), "xyx", "yzy", "xyx", - 'x', Items.emerald, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); + 'x', Items.emerald, 'y', Items.stick, 'z', ModItems.upgradeTemplate); + + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 1), "xyx", "yzy", "xyx", + 'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 2), "wyw", "yzy", "xyx", + 'w', new ItemStack(Blocks.redstone_torch), 'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 3), "wyw", "yzy", "xyx", + 'w', Items.comparator, 'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate); } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java index 86cc867..b66a77d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java +++ b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java @@ -47,7 +47,8 @@ public class ItemUpgrade extends Item @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { - list.add(StatCollector.translateToLocalFormatted("storageDrawers.upgrade.description", itemStack.getItemDamage())); + int mult = StorageDrawers.config.getStorageUpgradeMultiplier(itemStack.getItemDamage()); + list.add(StatCollector.translateToLocalFormatted("storageDrawers.upgrade.description", mult)); } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java new file mode 100644 index 0000000..d5e71ac --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java @@ -0,0 +1,73 @@ +package com.jaquadro.minecraft.storagedrawers.item; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +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.MathHelper; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemUpgradeStatus extends Item +{ + public static final String[] iconNames = new String[] { null, "level1", "level2", "level3" }; + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public ItemUpgradeStatus (String name) { + setUnlocalizedName(name); + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(ModCreativeTabs.tabStorageDrawers); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage (int meta) { + return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; + } + + @Override + public String getUnlocalizedName (ItemStack itemStack) { + int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); + if (iconNames[meta] == null) + return super.getUnlocalizedName(); + + return super.getUnlocalizedName() + "." + iconNames[meta]; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + String name = getUnlocalizedName(itemStack); + list.add(StatCollector.translateToLocalFormatted(name + ".description")); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < iconNames.length; i++) { + if (iconNames[i] != null) + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IIconRegister register) { + icons = new IIcon[iconNames.length]; + + for (int i = 0; i < iconNames.length; i++) { + if (iconNames[i] != null) + icons[i] = register.registerIcon(StorageDrawers.MOD_ID + ":upgrade_status_" + iconNames[i]); + } + } +}