From 06c97d6665f9f639060fcbd4ff9fad57c34c93e9 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Fri, 17 Oct 2014 19:28:54 -0400 Subject: [PATCH 1/3] GUI Work --- StorageDrawers.iml | 5 +- StorageDrawers.ipr | 2 +- build.gradle | 9 +- resources/META-INF/StorageDrawers_at.cfg | 1 + .../assets/storagedrawers/lang/en_US.lang | 3 + .../storagedrawers/textures/components.png | Bin 0 -> 1317 bytes .../storagedrawers/textures/gui/drawers_2.png | Bin 0 -> 1359 bytes .../storagedrawers/textures/gui/drawers_4.png | Bin 0 -> 1380 bytes .../textures/gui/drawers_comp.png | Bin 0 -> 1533 bytes .../textures/items/upgrade_lock.png | Bin 0 -> 456 bytes resources/mcmod.info | 2 +- .../storagedrawers/StorageDrawers.java | 8 +- .../storagedrawers/block/BlockDrawers.java | 5 + .../block/tile/TileEntityCompDrawers.java | 2 +- .../block/tile/TileEntityDrawers.java | 15 +-- .../block/tile/TileEntityDrawersBase.java | 60 +++++++++- .../storagedrawers/client/gui/GuiDrawers.java | 100 ++++++++++++++++ .../client/renderer/StorageRenderItem.java | 72 ++++++++++++ .../config/CompTierRegistry.java | 1 + .../storagedrawers/core/ModIntegration.java | 33 ++++++ .../core/handlers/GuiHandler.java | 47 ++++++++ .../integration/IModIntegration.java | 7 ++ .../integration/NotEnoughItems.java | 52 ++++++++ .../inventory/ContainerDrawers.java | 111 ++++++++++++++++++ .../inventory/ContainerDrawers2.java | 25 ++++ .../inventory/ContainerDrawers4.java | 26 ++++ .../inventory/InventoryStorage.java | 87 ++++++++++++++ .../inventory/InventoryUpgrade.java | 90 ++++++++++++++ 28 files changed, 747 insertions(+), 16 deletions(-) create mode 100644 resources/META-INF/StorageDrawers_at.cfg create mode 100644 resources/assets/storagedrawers/textures/components.png create mode 100644 resources/assets/storagedrawers/textures/gui/drawers_2.png create mode 100644 resources/assets/storagedrawers/textures/gui/drawers_4.png create mode 100644 resources/assets/storagedrawers/textures/gui/drawers_comp.png create mode 100644 resources/assets/storagedrawers/textures/items/upgrade_lock.png create mode 100644 src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/core/ModIntegration.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/IModIntegration.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java diff --git a/StorageDrawers.iml b/StorageDrawers.iml index dda19d5..6684276 100644 --- a/StorageDrawers.iml +++ b/StorageDrawers.iml @@ -6,7 +6,6 @@ - @@ -15,11 +14,11 @@ - + - + diff --git a/StorageDrawers.ipr b/StorageDrawers.ipr index e5f9e05..35eb233 100644 --- a/StorageDrawers.ipr +++ b/StorageDrawers.ipr @@ -174,7 +174,7 @@ - + diff --git a/build.gradle b/build.gradle index e9c2274..a454d9a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,10 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + //maven { + // name 'CB Maven FS' + // url "http://chickenbones.net/maven/" + //} } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' @@ -17,7 +21,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.1.5" +version = "1.7.10-1.1.6" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" @@ -55,6 +59,9 @@ dependencies { // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html + //compile "codechicken:CodeChickenLib:${config.cb_minecraft_version}-${config.code_chicken_lib_version}:dev" + //compile "codechicken:CodeChickenCore:${config.cb_minecraft_version}-${config.code_chicken_core_version}:dev" + //compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev" } processResources diff --git a/resources/META-INF/StorageDrawers_at.cfg b/resources/META-INF/StorageDrawers_at.cfg new file mode 100644 index 0000000..238e2bd --- /dev/null +++ b/resources/META-INF/StorageDrawers_at.cfg @@ -0,0 +1 @@ +public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet.minecraft.inventory.Slot;)V # DrawSlot \ No newline at end of file diff --git a/resources/assets/storagedrawers/lang/en_US.lang b/resources/assets/storagedrawers/lang/en_US.lang index a500380..c4e617c 100644 --- a/resources/assets/storagedrawers/lang/en_US.lang +++ b/resources/assets/storagedrawers/lang/en_US.lang @@ -1,5 +1,8 @@ itemGroup.storageDrawers=Storage Drawers +container.drawers=Drawers +storageDrawers.container.upgrades=Upgrades + # Items item.upgradeTemplate.name=Upgrade Template item.upgrade.iron.name=Storage Upgrade (II) diff --git a/resources/assets/storagedrawers/textures/components.png b/resources/assets/storagedrawers/textures/components.png new file mode 100644 index 0000000000000000000000000000000000000000..12a78cd9b6f97d54ee1a1bf6c30ac0cf65ef043c GIT binary patch literal 1317 zcmb_c{WsGK9Gg|iauZkb%26EAS-NS z_z@EqtzpA@)9(&W6q(3_8gY^uM!_di31kv1mO#XVVrh8TKG;!w2Fw@Xvj>LoLHY$E zef(g%5ql8`v1ov4ib1H@s0fI{!UBx4Z9QfF#AI1yM8;)-KpSn=U?!Fq7)<86)X=C< z5Qtl`(U1r>$$V^hXzaOB&8RTVHq`dHwxj8q%US4N*c-bGcVV?BKYZjg@gh@+X@s<= zZ057B@?%hNv9*hH zm-OZLI|X9~Iyc(D7NznqYUxnnvhG-uEW5yHc*X}VsJM$2*QQF~34m+=SA~9qKoMe- z1`xxVcAw-C=WjQ+f752MC#yN9+YeD${vVL)>LI>1M@5thS+D5dbNZcF9Np)?GtI9h ztCTZ~-xqmh5|^3aX>jX-VPlRQup{<~vcJ%T7q(nNfNOuR)CKt$l!3z1c`=15*_ev?W z&n+`%@izhvv#^+feCm{;op*T2Ad*5(*$8>l0Hn0M`b1nshSYbKJei7Y3q2-%EDHtK1uAgF@yWgsHv#5*P0R!OGrMiCNMl(?twV zD6y3fdho}lt#S6bmn2{rB@W6f)0HobB5vJ*v^pstQLv8(UFVN`5!;A6MvgR960yyK zb{QVWcOLCo-L_ALAAgW8<`ZZWmnE+0F`hQ4!L+apfL3~SQk?vj!gX?!Ta@QN{_$hr z*wZ$4y*sr+9-jA)-MQ-%_=8dpppnYA|MJ$NlKLVwi2Ke%q4}!rRpp!zdM$q#3*t{u zSiIoe#XkKy2Xy`F)bPsX*#-H6{ZoyaJ+mVJO~jK|2e=K-3xYODei(C{suB)s?qASEHbnad7WdmYUVW)yI}EinlAd5h_~G zx0><51^*%>*8LIzsVxogn})u+rCZQ7&g7ZH$}*8kP!gjEzO#;cTJ0EeaC6AqmYeJ7 z{Vwv!zpbjAeV-Qwr xMFmHP*#P_*!JTA|cM3Vv5F7(B&B*_8eckBfN|7g~>Jo0P4jU02-iX0n_zzV)aP9yA literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/gui/drawers_2.png b/resources/assets/storagedrawers/textures/gui/drawers_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6cefbe252fa4ea25b395c503326bba504402d1f2 GIT binary patch literal 1359 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%Z;_2(kevgZrjfFvS!^f9E zAh78xOS*_S(yBMK95;~x%#66$DHiC zTYv7v+EnjoFnn{(uA#W_hohZM)bEG~zGb_YUk+pOd+_Pd^!W$x+`sQH?{`ahhSsls zhMJ$BQr{*wEzZl&pKtg5_unrMy%O3^Pv8IXY5TO(Kb0E-IT>2;pxTJv4Ewgvo;`aj zf1=@hyV_kpetdjd&nI|M>7tz08Ptsthep*E2k`IJ#eBNAdYtED6hAa@(|9e_wM_ zh~W?m(dZ4k!Qn092foni9$65b=)dz})JJY1|Fg-#?ro#%pa=5-*-TOZ(RI zGV{Rh-PXl@XJ*RHSd_Se!DpFpN#D!B2QRym&TW5Q5w++U}ee=xY6HOOxIDFD}X7Qxi&L<;T9y~o+`(fVXJ2F{q{0APY)YTf*zdnDq z^1jTu%LV@hUu->mKj(j$(*A$Z=jVJs|ImiFo|R$Gdp=FWW0cZ=fj|ovqJU2%DA_=e1CGk|9JiI;^q7tmV+GdWVSK-cZC}$?3oB5_xWsJ ztn!Mt861CoYWnB-{ml6{i42$=-*BXyd-i;Tj5X8D%|9*6Sfcu58_(SQ z1LW%-w`JfECK_#4o?tn9{^6p&cN{FyDeem{Z)9mOU<9EJi_IC|a^;*8d$#AE=#0x7 zwKo72K7RJ42oli1uqFnbS$E)BP95LrjoJo>H)?-)8NuW*g8_&PrW}51zufRH%N^UQ z9sBoxKioRwu;_tzzkXG{O>Q(VX8vFj_n$%jnw>(0a(o@I*dhx^T#fI0a9={W=tv<* Nzo)C8%Q~loCIGW{^O*nu literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/gui/drawers_4.png b/resources/assets/storagedrawers/textures/gui/drawers_4.png new file mode 100644 index 0000000000000000000000000000000000000000..7e9ff89db5904a013d9c98e96feb951a855700ce GIT binary patch literal 1380 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%Z;_2(kevgZrjZr1y$irHo z5NCl$WHAE+UkL~^W~*$z1{7pTcl32+VA$Bt{U?zX$o=f;;uunK>+Rixxwq3K8WK;R zkg~08UbMWTx1{qPPYVCtT`flKwVJye{bCn4WLt^7k?2*5UgYwrR!%`+(qZ*O3+{ag zKQw=Jclvj61OC;;@&|%)>L+~XKUb@>VfxiqAGe4$D(~3y;bD4OUVeVNxcXZ`9?`#g z4CUqJ&+XK1WbTc#-lS4U%xJvXEUC}ec-|M_?f=K$ z`ReuZ6{|}a*pg$7{{KDS{(hR&@+$cXZf^#T)A5WsvXA50zx@>Z7xJF@w?Kn<8~-)M zZ-2pD`(#drL?)uqH|7eXJB#h_r0<{dy|I?#z~sdCxxqP`3ReMn5ljvdzqk@^1XbS% zE!TX{oIllG+kflQZEJVWR06ugJD#z^NTBp31CNblhY{3al|}-tOdp!mnFC37$D@-D zBAf?={n-|s5MnrVDV$**k4x;oHD6K`PJu$Fob^F;Ma4AkhWv*QXR0!^a1ugiU!^UW zJ$rU@I!`%s-Oo=)=g1bfNiWNo5z4@Jn6s+mVc3I*%}M9_pYMp?bQowM3mA!sH>{7} zKdZROQs?j@CWAS5!o$Pa=RbKCuyF=Mj{m!Zit0Npr|2j#==;B0`+W{j-1s+8{Lyvw z&;9@I%=vycac0_g`Np{0|IU7^SO4^S|JO5>|7E6SehX(f@Ehpjvvr&wE?xPzwq|8< zMBh=C2NAC$i#0Z~G#D^8Y>3ol?E9LLU;JS9)x+z5v-j`cD9BR0A#S~Vy!q_2A2wNi z|9FNdf4|)$ec|zrvojCL^lQtX_s?gacPV-G+01i=(_d8p1JZ|qSd{a;jv=@@XRGB| z%bxV-j}N}(NI56+Y|lNx6ORw}AMbN`=2O=v+j#7;H3Nq*(P*>s1k1_u4_CYa8usM* z4Z#eXG8UusPsMLIOyuq};>%9xIZd|l%*;PB$2J$cE6h-`W|HlPCyKX!gf6T*@XROi z-0RpzOS#=lvyFdR?wccrP(d*902SO6y)ozH`9zyC*0i!WTs1b+7zETn=*+2apXNW7 z*vArMyJP>}yf{m<>hZp_wa=zsi`|HHpK>@3xv9WvY3H^uLOh{vsE@<0}8UFJNh~@Fl_AS{*%bcz`)w$>EaktaqI2fhrYLCB-$Rb zlnSRUuutGUA~!LCt1gBAkc?xKWCW|7pPiD^tQMBz8~f+Kp0sL9=x?)CZ>+Z+JpTCN z^zVXK68HQ$dGzSfq}_XW?zGG}aQN`yM_->lO|7{QFEhh_{`&XwyXy2eO#fIBV|Fdy zI`8Jf@4W|#o~N5wN#Fdr@=T4LzW)E3PwzJ;um3mGxnHVnMaY+EhI#Ym?W*(NaJj@P zcF(!A%@_av{rl+o?>9GQ|2uQ{ZtNG$12Zl<$?HG+)E}Il|4jLn(M+FRb=+%r z?%O998yj2t*UT@g(*FPP?CbeUy$TsM?%lfwlHRd*Z>h65dm$IYL8X3%Y4hgK-(APu z`}gnf?XR~x99_g5aHZ}I{Q+@58@!cENP4^P>~ z76J8x-OeJ+z@f$<;KQIWgTcXou_1v8tHf(YlYnbX8s9%VuVq=#xM@=VQJWPrgBdu) zYFPrNUC~?p%4yXL29ar3)MobEg9I-;o7@;S|3>kudUifh*@i`HSO0kJ|Hks_e&+T9 zpw*9nPWSsdMc!X{kv~hq(UtQ)Jkb_jUryNLK+8h!@|eu@ zkvgwY&TMCAH*0gU-_FD?o>0~W8qyiUPs1K;T0CQOZQpLyVhdJS@bT&~tY5$W*_;Hv z!v-rDru6>)^JmXTw>&;gHsOY+$6`%xo;a&`Qh{m1u0s94Y0Bp9CRf=Lb_%Y~KXbe8 z{+#<~6KAaY?Y5xwwEs3==}*6w&$HY=|FA)5JqyF1c?=F4UimYIeSMq#)OqgV0v z*Qx_D{h^I#fvy!_e)};nZxQ8tXtoMtH3Pab18Bg?zR<@0sn=_Xlw<7C*Vo?-EY{4$8Tym|+JD&l+MK0&(`RO2AxjQ$So@E;&@=Gw{0ZV# OApM@MelF{r5}E*U=tQgl literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/items/upgrade_lock.png b/resources/assets/storagedrawers/textures/items/upgrade_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..7f21028236095c36f667b828d5398906db0d3582 GIT binary patch literal 456 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#_2vx%6^IZ>tv z6yhxKh%9Dc;Q9cp1*e|9?GF;+WBrGf($djOSt>O0e{AAH|7QvZ{#}a~f?znNFX^zeso_zb-*3ZtH ze;M+0_x7^BPHoJ*5-6NFK~#`cJ7d;H`E?eCF6=(%=U58ssVOQlrZ@Bc`1V%3S%Y8y zaKF60goTBL#4972gE=V)85tbu_Vxc{t};yEc92SZ@NxEajam1Z=k~1Ol-!VTndLK= z&!6*$LwU09@bHA^?M-|UTQWy*HREzUn`Z8LNfm7T4l~3H87m}aNP0Bpvi;nfeXy{{ zf#u}dyTyXL85M3PoU8l$)Hp_%qk&1BdZp+s?@D ucb9RwT>t~u=fcHHTs$mn55HpSVq{30P<~J&AiM_{bPS%ZelF{r5}E+MMVkQt literal 0 HcmV?d00001 diff --git a/resources/mcmod.info b/resources/mcmod.info index bfcd252..0747608 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "StorageDrawers", "name": "Storage Drawers", "description": "Multi-drawer storage blocks for quick storage and retrieval.", - "version": "1.1.5", + "version": "1.1.6", "credits": "By jaquadro", "logoFile": "", "url": "http://www.jaquadro.com/", diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 49d0ee8..e399c5d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.config.CompTierRegistry; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.config.OreDictRegistry; import com.jaquadro.minecraft.storagedrawers.core.*; +import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; @@ -27,12 +28,13 @@ public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; - public static final String MOD_VERSION = "1.1.5"; + public static final String MOD_VERSION = "1.1.6"; static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks(); public static final ModItems items = new ModItems(); public static final ModRecipes recipes = new ModRecipes(); + public static final ModIntegration integration = new ModIntegration(); public static SimpleNetworkWrapper network; public static ConfigManager config; @@ -67,13 +69,17 @@ public class StorageDrawers public void init (FMLInitializationEvent event) { proxy.registerRenderers(); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); FMLCommonHandler.instance().bus().register(instance); MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); + + integration.init(); } @Mod.EventHandler public void postInit (FMLPostInitializationEvent event) { recipes.init(); + integration.postInit(); } @SubscribeEvent diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index a83f326..ba5477d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.core.ModItems; +import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -195,6 +196,10 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } } + else if (true) { + player.openGui(StorageDrawers.instance, GuiHandler.drawersGuiID, world, x, y, z); + return true; + } if (tileDrawers.getDirection() != side) return false; diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java index 988e84d..c9a51ed 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java @@ -521,7 +521,7 @@ public class TileEntityCompDrawers extends TileEntityDrawersBase implements ISto @Override public String getInventoryName () { - return null; + return "container.compDrawers"; } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 9644cad..06b49c8 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -226,8 +226,7 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage stack.stackSize = 64 - Math.min(64, data[slot].remainingCapacity()); snapshotItems[slot] = stack; snapshotCounts[slot] = stack.stackSize; - } - else { + } else { snapshotItems[slot] = null; snapshotCounts[slot] = 0; } @@ -254,7 +253,7 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public void setInventorySlotContents (int slot, ItemStack itemStack) { - if (slot >= getSizeInventory()) + if (slot >= getSizeInventory() || itemStack == null) return; int insertCount = itemStack.stackSize; @@ -265,8 +264,7 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage int count = putItemsIntoSlot(slot, itemStack, insertCount); if (count > 0 && !worldObj.isRemote) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - else if (insertCount < 0) { + } else if (insertCount < 0) { ItemStack rmStack = takeItemsFromSlot(slot, -insertCount); if (rmStack != null && rmStack.stackSize > 0 && !worldObj.isRemote) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -280,7 +278,7 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public String getInventoryName () { - return null; + return "container.drawers"; } @Override @@ -295,7 +293,10 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public boolean isUseableByPlayer (EntityPlayer player) { - return false; + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) + return false; + + return player.getDistanceSq(xCoord + .5, yCoord + .5, zCoord + .5) <= 64; } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java index 9956051..bcc2991 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java @@ -1,21 +1,26 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; -public abstract class TileEntityDrawersBase extends TileEntity +public abstract class TileEntityDrawersBase extends TileEntity implements ISidedInventory { private int direction; private int drawerCapacity = 1; private int level = 1; private int statusLevel = 0; + private ItemStack[] upgrades = new ItemStack[5]; protected int[] autoSides = new int[] { 0, 1 }; @@ -71,6 +76,20 @@ public abstract class TileEntityDrawersBase extends TileEntity public abstract ItemStack getSingleItemStack (int slot); + public ItemStack getUpgrade (int slot) { + if (slot < 0 || slot >= upgrades.length) + return null; + + return upgrades[slot]; + } + + public void setUpgrade (int slot, ItemStack upgrade) { + if (slot < 0 || slot >= upgrades.length) + return; + + upgrades[slot] = upgrade; + } + @Override public void readFromNBT (NBTTagCompound tag) { super.readFromNBT(tag); @@ -83,6 +102,19 @@ public abstract class TileEntityDrawersBase extends TileEntity statusLevel = 0; if (tag.hasKey("Stat")) statusLevel = tag.getByte("Stat"); + + for (int i = 0, n = upgrades.length; i < n; i++) + upgrades[i] = null; + + if (tag.hasKey("Upgrades")) { + NBTTagList list = tag.getTagList("Upgrades", Constants.NBT.TAG_COMPOUND); + for (int i = 0, n = list.tagCount(); i < n; i++) { + NBTTagCompound uTag = list.getCompoundTagAt(i); + + ItemStack item = new ItemStack(Item.getItemById(uTag.getShort("Item")), 1, uTag.getShort("Meta")); + upgrades[uTag.getByte("Slot")] = item; + } + } } @Override @@ -95,6 +127,24 @@ public abstract class TileEntityDrawersBase extends TileEntity if (statusLevel > 0) tag.setByte("Stat", (byte)statusLevel); + + if (getUpgradeCount() > 0) { + NBTTagList list = new NBTTagList(); + + for (int i = 0, n = upgrades.length; i < n; i++) { + if (upgrades[i] == null) + continue; + + NBTTagCompound uTag = new NBTTagCompound(); + uTag.setByte("Slot", (byte)i); + uTag.setShort("Item", (short) Item.getIdFromItem(upgrades[i].getItem())); + uTag.setShort("Meta", (short) upgrades[i].getItemDamage()); + + list.appendTag(uTag); + } + + tag.setTag("Upgrades", list); + } } @Override @@ -110,4 +160,12 @@ public abstract class TileEntityDrawersBase extends TileEntity readFromNBT(pkt.func_148857_g()); getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } + + private int getUpgradeCount () { + int count = 0; + for (ItemStack item : upgrades) + count += (item != null) ? 1 : 0; + + return count; + } } \ No newline at end of file diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java new file mode 100644 index 0000000..9299868 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java @@ -0,0 +1,100 @@ +package com.jaquadro.minecraft.storagedrawers.client.gui; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import com.jaquadro.minecraft.storagedrawers.client.renderer.StorageRenderItem; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers2; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers4; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; +import scala.tools.nsc.doc.model.Object; + +public class GuiDrawers extends GuiContainer +{ + private static final ResourceLocation guiTextures2 = new ResourceLocation("storagedrawers", "textures/gui/drawers_2.png"); + private static final ResourceLocation guiTextures4 = new ResourceLocation("storagedrawers", "textures/gui/drawers_4.png"); + private static final ResourceLocation guiTexturesComp = new ResourceLocation("storagedrawers", "textures/gui/drawers_comp.png"); + + private static final Object[] empty = new Object[0]; + + private static RenderItem storageItemRender = new StorageRenderItem(); + + private TileEntityDrawersBase tileDrawers; + + public GuiDrawers (InventoryPlayer inventory, TileEntityDrawersBase tileEntity) { + super(getContainer(inventory, tileEntity)); + tileDrawers = tileEntity; + + xSize = 176; + ySize = 199; + + itemRender = storageItemRender; + } + + private static Container getContainer (InventoryPlayer inventory, TileEntityDrawersBase tile) { + switch (tile.getDrawerCount()) { + case 2: + return new ContainerDrawers2(inventory, tile); + case 4: + return new ContainerDrawers4(inventory, tile); + default: + return null; + } + } + + @Override + protected void drawGuiContainerForegroundLayer (int p_146979_1_, int p_146979_2_) { + String name = tileDrawers.hasCustomInventoryName() ? tileDrawers.getInventoryName() : I18n.format(tileDrawers.getInventoryName(), empty); + fontRendererObj.drawString(name, 8, 6, 4210752); + fontRendererObj.drawString(I18n.format("storageDrawers.container.upgrades", empty), 8, 75, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory",empty), 8, ySize - 96 + 2, 4210752); + } + + + @Override + protected void drawGuiContainerBackgroundLayer (float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1, 1, 1, 1); + if (tileDrawers.getDrawerCount() == 2) + mc.getTextureManager().bindTexture(guiTextures2); + else if (tileDrawers.getDrawerCount() == 4) + mc.getTextureManager().bindTexture(guiTextures4); + else + mc.getTextureManager().bindTexture(guiTexturesComp); + + int guiX = (width - xSize) / 2; + int guiY = (height - ySize) / 2; + drawTexturedModalRect(guiX, guiY, 0, 0, xSize, ySize); + } + + private RenderItem setItemRender (RenderItem renderItem) { + if (StorageDrawers.integration.NEI.isLoaded()) + return StorageDrawers.integration.NEI.setItemRender(renderItem); + else { + RenderItem prev = itemRender; + itemRender = renderItem; + + return prev; + } + } + + @Override + public void func_146977_a (Slot slot) { + RenderItem ri = setItemRender(storageItemRender); + + super.func_146977_a(slot); + + setItemRender(ri); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java new file mode 100644 index 0000000..efd6b55 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java @@ -0,0 +1,72 @@ +package com.jaquadro.minecraft.storagedrawers.client.renderer; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; + +public class StorageRenderItem extends RenderItem +{ + @Override + public void renderItemOverlayIntoGUI (FontRenderer font, TextureManager texManager, ItemStack item, int x, int y, String text) + { + if (item != null) + { + float scale = .5f; + + if (item.stackSize > 1 || text != null) + { + text = (text == null) ? String.valueOf(item.stackSize) : text; + int textX = (int)((x + 16 - font.getStringWidth(text) * scale) / scale) - 1; + int textY = (int)((y + 16 - 7 * scale) / scale) - 1; + + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + font.drawStringWithShadow(text, textX, textY, 16777215); + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + } + + if (item.getItem().showDurabilityBar(item)) + { + double health = item.getItem().getDurabilityForDisplay(item); + int j1 = (int)Math.round(13.0D - health * 13.0D); + int k = (int)Math.round(255.0D - health * 255.0D); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDisable(GL11.GL_BLEND); + Tessellator tessellator = Tessellator.instance; + int l = 255 - k << 16 | k << 8; + int i1 = (255 - k) / 4 << 16 | 16128; + this.renderQuad(tessellator, x + 2, y + 13, 13, 2, 0); + this.renderQuad(tessellator, x + 2, y + 13, 12, 1, i1); + this.renderQuad(tessellator, x + 2, y + 13, j1, 1, l); + //GL11.glEnable(GL11.GL_BLEND); // Forge: Disable Bled because it screws with a lot of things down the line. + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + } + } + + private void renderQuad (Tessellator tessellator, int x, int y, int w, int h, int color) + { + tessellator.startDrawingQuads(); + tessellator.setColorOpaque_I(color); + tessellator.addVertex(x + 0, y + 0, 0); + tessellator.addVertex(x + 0, y + h, 0); + tessellator.addVertex(x + w, y + h, 0); + tessellator.addVertex(x + w, y + 0, 0); + tessellator.draw(); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java index dbeab30..5eb006a 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java +++ b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java @@ -25,6 +25,7 @@ public class CompTierRegistry register(new ItemStack(Blocks.nether_brick), new ItemStack(Items.netherbrick), 4); register(new ItemStack(Blocks.quartz_block), new ItemStack(Items.quartz), 4); register(new ItemStack(Blocks.melon_block), new ItemStack(Items.melon), 9); + register(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand), 4); } public void register (ItemStack upper, ItemStack lower, int convRate) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModIntegration.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModIntegration.java new file mode 100644 index 0000000..4425016 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModIntegration.java @@ -0,0 +1,33 @@ +package com.jaquadro.minecraft.storagedrawers.core; + +import com.jaquadro.minecraft.storagedrawers.integration.IModIntegration; +import com.jaquadro.minecraft.storagedrawers.integration.NotEnoughItems; + +import java.util.ArrayList; +import java.util.List; + +public class ModIntegration +{ + private List mods = new ArrayList(); + + public final NotEnoughItems NEI; + + public ModIntegration () { + NEI = add(new NotEnoughItems()); + } + + private E add (E mod) { + mods.add(mod); + return mod; + } + + public void init () { + for (int i = 0, n = mods.size(); i < n; i++) + mods.get(i).init(); + } + + public void postInit () { + for (int i = 0, n = mods.size(); i < n; i++) + mods.get(i).postInit(); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java b/src/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java new file mode 100644 index 0000000..629fe40 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java @@ -0,0 +1,47 @@ +package com.jaquadro.minecraft.storagedrawers.core.handlers; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import com.jaquadro.minecraft.storagedrawers.client.gui.GuiDrawers; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers2; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerDrawers4; +import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class GuiHandler implements IGuiHandler +{ + public static int drawersGuiID = 0; + + @Override + public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof TileEntityDrawers) + return new ContainerDrawers(player.inventory, (TileEntityDrawersBase) tile); + + return null; + } + + @Override + public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof TileEntityDrawers) + return new GuiDrawers(player.inventory, (TileEntityDrawersBase) tile); + + return null; + } + + private ContainerDrawers getContainer (TileEntityDrawers tile, InventoryPlayer playerInventory) { + switch (tile.getDrawerCount()) { + case 2: + return new ContainerDrawers2(playerInventory, tile); + case 4: + return new ContainerDrawers4(playerInventory, tile); + default: + return null; + } + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IModIntegration.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IModIntegration.java new file mode 100644 index 0000000..226b1ad --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IModIntegration.java @@ -0,0 +1,7 @@ +package com.jaquadro.minecraft.storagedrawers.integration; + +public interface IModIntegration +{ + public void init (); + public void postInit (); +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java b/src/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java new file mode 100644 index 0000000..f788697 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java @@ -0,0 +1,52 @@ +package com.jaquadro.minecraft.storagedrawers.integration; + +import cpw.mods.fml.common.Loader; +import net.minecraft.client.renderer.entity.RenderItem; + +import java.lang.reflect.Field; + +public class NotEnoughItems implements IModIntegration +{ + private static final String MOD_ID = "NotEnoughItems"; + + boolean loaded; + + Class clGuiContainerManager; + Field fdDrawItems; + + @Override + public void init () { + if (!Loader.isModLoaded(MOD_ID)) + return; + + try { + clGuiContainerManager = Class.forName("codechicken.nei.guihook.GuiContainerManager"); + fdDrawItems = clGuiContainerManager.getDeclaredField("drawItems"); + + loaded = true; + } + catch (ClassNotFoundException e) { } + catch (NoSuchFieldException e) { } + } + + @Override + public void postInit () { } + + public boolean isLoaded () { + return loaded; + } + + public RenderItem setItemRender (RenderItem itemRender) { + if (fdDrawItems == null) + return null; + + try { + RenderItem prev = (RenderItem) fdDrawItems.get(null); + fdDrawItems.set(null, itemRender); + return prev; + } + catch (IllegalAccessException e) { + return null; + } + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java new file mode 100644 index 0000000..d1302b9 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java @@ -0,0 +1,111 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.List; + +public class ContainerDrawers extends Container +{ + private static final int InventoryX = 8; + private static final int InventoryY = 117; + private static final int HotbarY = 175; + + private static final int UpgradeX = 44; + private static final int UpgradeY = 86; + + private IInventory storageInventory; + private IInventory upgradeInventory; + + private List storageSlots; + private List upgradeSlots; + private List playerSlots; + private List hotbarSlots; + + public ContainerDrawers (InventoryPlayer playerInventory, TileEntityDrawersBase tileEntity) { + //storageInventory = new InventoryStorage(tileEntity, this); + storageInventory = new InventoryStorage(tileEntity); + upgradeInventory = new InventoryUpgrade(tileEntity); + + storageSlots = new ArrayList(); + for (int i = 0; i < tileEntity.getDrawerCount(); i++) + storageSlots.add(addSlotToContainer(new Slot(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); + + upgradeSlots = new ArrayList(); + for (int i = 0; i < 5; i++) + upgradeSlots.add(addSlotToContainer(new Slot(upgradeInventory, i, UpgradeX + i * 18, UpgradeY))); + + playerSlots = new ArrayList(); + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) + playerSlots.add(addSlotToContainer(new Slot(playerInventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); + } + + hotbarSlots = new ArrayList(); + for (int i = 0; i < 9; i++) + hotbarSlots.add(addSlotToContainer(new Slot(playerInventory, i, InventoryX + i * 18, HotbarY))); + } + + protected int getStorageSlotX (int slot) { + return 0; + } + + protected int getStorageSlotY (int slot) { + return 0; + } + + @Override + public boolean canInteractWith (EntityPlayer player) { + return storageInventory.isUseableByPlayer(player) || upgradeInventory.isUseableByPlayer(player); + } + + @Override + public ItemStack transferStackInSlot (EntityPlayer player, int slotIndex) { + ItemStack itemStack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + + int storageStart = storageSlots.get(0).slotNumber; + int storageEnd = storageSlots.get(storageSlots.size() - 1).slotNumber + 1; + int upgradeStart = upgradeSlots.get(0).slotNumber; + int upgradeEnd = upgradeSlots.get(upgradeSlots.size() - 1).slotNumber + 1; + + // Assume inventory and hotbar slot IDs are contiguous + int inventoryStart = playerSlots.get(0).slotNumber; + int hotbarStart = hotbarSlots.get(0).slotNumber; + int hotbarEnd = hotbarSlots.get(hotbarSlots.size() - 1).slotNumber + 1; + + if (slot != null && slot.getHasStack()) { + ItemStack slotStack = slot.getStack(); + itemStack = slotStack.copy(); + + // Try merge upgrades to inventory + if (slotIndex >= upgradeStart && slotIndex < upgradeEnd) { + if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, true)) + return null; + slot.onSlotChange(slotStack, itemStack); + } + + // Try merge stack into inventory + else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false)) + return null; + + if (slotStack.stackSize == 0) + slot.putStack(null); + else + slot.onSlotChanged(); + + if (slotStack.stackSize == itemStack.stackSize) + return null; + + slot.onPickupFromSlot(player, slotStack); + } + + return itemStack; + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java new file mode 100644 index 0000000..78d38d1 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java @@ -0,0 +1,25 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import net.minecraft.entity.player.InventoryPlayer; + +public class ContainerDrawers2 extends ContainerDrawers +{ + private static final int[][] slotCoordinates = new int[][] { + { 80, 23 }, { 80, 49 } + }; + + public ContainerDrawers2 (InventoryPlayer playerInventory, TileEntityDrawersBase tileEntity) { + super(playerInventory, tileEntity); + } + + @Override + protected int getStorageSlotX (int slot) { + return slotCoordinates[slot][0]; + } + + @Override + protected int getStorageSlotY (int slot) { + return slotCoordinates[slot][1]; + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java new file mode 100644 index 0000000..dc5bd1f --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java @@ -0,0 +1,26 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import net.minecraft.entity.player.InventoryPlayer; + +public class ContainerDrawers4 extends ContainerDrawers +{ + private static final int[][] slotCoordinates = new int[][] { + { 67, 23 }, { 67, 49 }, { 93, 23 }, { 93, 49 } + }; + + public ContainerDrawers4 (InventoryPlayer playerInventory, TileEntityDrawersBase tileEntity) { + super(playerInventory, tileEntity); + } + + @Override + protected int getStorageSlotX (int slot) { + return slotCoordinates[slot][0]; + } + + @Override + protected int getStorageSlotY (int slot) { + return slotCoordinates[slot][1]; + } +} + diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java new file mode 100644 index 0000000..799d69f --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java @@ -0,0 +1,87 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +public class InventoryStorage implements IInventory +{ + private TileEntityDrawersBase tile; + + public InventoryStorage (TileEntityDrawersBase tileEntity) { + tile = tileEntity; + } + + @Override + public int getSizeInventory () { + return tile.getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot (int slot) { + ItemStack stack = tile.getSingleItemStack(slot); + if (stack == null) + return null; + + stack = stack.copy(); + stack.stackSize = tile.getItemCount(slot); + + return stack; + } + + @Override + public ItemStack decrStackSize (int slot, int count) { + return tile.decrStackSize(slot, count); + } + + @Override + public ItemStack getStackInSlotOnClosing (int slot) { + return null; + } + + @Override + public void setInventorySlotContents (int slot, ItemStack stack) { + + } + + @Override + public String getInventoryName () { + return tile.getInventoryName(); + } + + @Override + public boolean hasCustomInventoryName () { + return tile.hasCustomInventoryName(); + } + + @Override + public int getInventoryStackLimit () { + return Integer.MAX_VALUE; + } + + @Override + public void markDirty () { + tile.markDirty(); + } + + @Override + public boolean isUseableByPlayer (EntityPlayer player) { + return tile.isUseableByPlayer(player); + } + + @Override + public void openInventory () { + + } + + @Override + public void closeInventory () { + + } + + @Override + public boolean isItemValidForSlot (int slot, ItemStack stack) { + return tile.isItemValidForSlot(slot, stack); + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java new file mode 100644 index 0000000..1c186b1 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java @@ -0,0 +1,90 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; +import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +public class InventoryUpgrade implements IInventory +{ + private static final int upgradeCapacity = 5; + + private TileEntityDrawersBase tile; + + public InventoryUpgrade (TileEntityDrawersBase tileEntity) { + tile = tileEntity; + } + + @Override + public int getSizeInventory () { + return upgradeCapacity; + } + + @Override + public ItemStack getStackInSlot (int slot) { + return tile.getUpgrade(slot); + } + + @Override + public ItemStack decrStackSize (int slot, int count) { + if (count > 0) + tile.setUpgrade(slot, null); + + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing (int slot) { + return null; + } + + @Override + public void setInventorySlotContents (int slot, ItemStack item) { + tile.setUpgrade(slot, item); + } + + @Override + public String getInventoryName () { + return tile.getInventoryName(); + } + + @Override + public boolean hasCustomInventoryName () { + return tile.hasCustomInventoryName(); + } + + @Override + public int getInventoryStackLimit () { + return 1; + } + + @Override + public void markDirty () { + tile.markDirty(); + } + + @Override + public boolean isUseableByPlayer (EntityPlayer player) { + return tile.isUseableByPlayer(player); + } + + @Override + public void openInventory () { + + } + + @Override + public void closeInventory () { + + } + + @Override + public boolean isItemValidForSlot (int slot, ItemStack item) { + if (item.getItem() instanceof ItemUpgrade || item.getItem() instanceof ItemUpgradeStatus) + return true; + + return false; + } +} From c95ac3a0f4b5a441f755f9d5e29609ad97206333 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Mon, 27 Oct 2014 01:14:40 -0400 Subject: [PATCH 2/3] Fix merge errors --- StorageDrawers.iml | 36 +++++++++++++------ StorageDrawers.ipr | 11 +++++- build.gradle | 2 +- .../storagedrawers/StorageDrawers.java | 6 ++++ .../block/tile/TileEntityDrawersBase.java | 1 - .../storagedrawers/client/gui/GuiDrawers.java | 1 - 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/StorageDrawers.iml b/StorageDrawers.iml index 6684276..dd0e211 100644 --- a/StorageDrawers.iml +++ b/StorageDrawers.iml @@ -1,31 +1,38 @@ - + - + + + + + + + + - + - + - + @@ -34,13 +41,22 @@ - + + + + + + + + + + - + - + @@ -200,7 +216,7 @@ - + @@ -649,7 +665,7 @@ - + diff --git a/StorageDrawers.ipr b/StorageDrawers.ipr index 35eb233..3eedc57 100644 --- a/StorageDrawers.ipr +++ b/StorageDrawers.ipr @@ -24,6 +24,15 @@ + + + @@ -181,7 +190,7 @@ - + diff --git a/build.gradle b/build.gradle index 3afd52f..a52968a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides archivesBaseName = "StorageDrawers" minecraft { - version = "1.7.10-10.13.0.1208" + version = "1.7.10-10.13.2.1232" assetDir = "runtime/assets" } diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 25820b5..9e5a64e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.config.CompTierRegistry; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.config.OreDictRegistry; import com.jaquadro.minecraft.storagedrawers.core.*; +import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; @@ -33,6 +34,7 @@ public class StorageDrawers public static final ModBlocks blocks = new ModBlocks(); public static final ModItems items = new ModItems(); public static final ModRecipes recipes = new ModRecipes(); + public static final ModIntegration integration = new ModIntegration(); public static SimpleNetworkWrapper network; public static ConfigManager config; @@ -67,13 +69,17 @@ public class StorageDrawers public void init (FMLInitializationEvent event) { proxy.registerRenderers(); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); FMLCommonHandler.instance().bus().register(instance); MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); + + integration.init(); } @Mod.EventHandler public void postInit (FMLPostInitializationEvent event) { recipes.init(); + integration.postInit(); } @SubscribeEvent diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java index 4d25918..7dd96d7 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersBase.java @@ -169,7 +169,6 @@ public abstract class TileEntityDrawersBase extends TileEntity implements ISided return count; } -} public abstract void clientUpdateCount (int slot, int count); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java index 9299868..89cb09c 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java @@ -19,7 +19,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import scala.tools.nsc.doc.model.Object; public class GuiDrawers extends GuiContainer { From d9d4459183ae8cf9b348ed5eb752ead9e87f242c Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 2 Nov 2014 00:57:10 -0400 Subject: [PATCH 3/3] Minor progress --- StorageDrawers.iml | 723 ++---------------- StorageDrawers.ipr | 528 +++++++++++++ .../storagedrawers/textures/gui/drawers_2.png | Bin 1359 -> 1381 bytes .../textures/gui/drawers_comp.png | Bin 1533 -> 1544 bytes .../block/tile/TileEntityCompDrawers.java | 2 +- .../block/tile/TileEntityDrawers.java | 8 +- .../storagedrawers/client/gui/GuiDrawers.java | 14 + .../inventory/ContainerDrawers.java | 6 +- .../inventory/InventoryStorage.java | 55 +- .../storagedrawers/inventory/SlotStorage.java | 17 + 10 files changed, 688 insertions(+), 665 deletions(-) create mode 100644 src/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java diff --git a/StorageDrawers.iml b/StorageDrawers.iml index dd0e211..aa404f8 100644 --- a/StorageDrawers.iml +++ b/StorageDrawers.iml @@ -1,676 +1,83 @@ - + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StorageDrawers.ipr b/StorageDrawers.ipr index 3eedc57..95250f9 100644 --- a/StorageDrawers.ipr +++ b/StorageDrawers.ipr @@ -30,6 +30,11 @@ @@ -192,5 +197,528 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/storagedrawers/textures/gui/drawers_2.png b/resources/assets/storagedrawers/textures/gui/drawers_2.png index 6cefbe252fa4ea25b395c503326bba504402d1f2..9857facc7cf6be3d33952269bd7c442822a336be 100644 GIT binary patch delta 983 zcmX@l^^|LZ4u>3z1=qW)LZ>I1Xw-l4ba4!+xb^m~W8RfCiH3(fr%ZP}Vhas_DD{MI z#cq$C?q#Co66Yr7th%SLI&N{0l(W0zVxy%WXMD7O|Jg&M;fOkSW!xX@AK#xnI(nJ4 zCvo%dlkNQSX>+&B+t=MW^YioK-G83HzPveDp1WrH*)-$1YhLod+qh@vhll9~-@kvq zEUu~kRxsw>|6_*_A70td$+v6w?%g}~?b~-FZ@ZGg<=N}&A0Fn{&41R<;HElxBC~9L znPvTvh`hW!zgmv&%K!iV9^GC3-mg}|KICuZznw*lGyeR!9KYPI#r4j;dsPd%{~r}% zI5a7o!Fqpgz5Q3kGv8i+)n9JM!ZwZXK*|^IXZHX0*xXj-J-wNwVZ$HM12V^d^f`Sz zXZu=_!Pr;+f#sc@&!^}xD)=xU(B!!+^7VBL#y-`IKIcClUcr*kmZ>g3yVAhOn}NeS zp3x^d%YXMPr_g_Iwl6hHoyH(AZ6DKzG=*1}7-#glp6rY!~0j zu%nn?e{vs-N`20X_C{c+rJbKKkL}Nwmy<2opZW0nTr>z_P`k`&b^MFQhcAwX&uki1AI~>WHV72r9zFOi1>dou5g<;k-PpXe}s z_V#Tx#K^_mi+Jf;kWnCJ@NbhtC^pFSn*N;7CgeEsKDogX(@xCa%^K4CG-}R~b&+X;e<1S~f zKAU;&Ej*z(%)b5U4bd47Z;1Y= zfF&u3Q|~^_e>@|PDQ}+b-TU`{pKhITSMh78xOS*_S(yBMK95;~x%#66$DHiC zTYv7v+EnjoFnn{(uA#W_hohZM)bEG~zGb_YUk+pOd+_Pd^!W$x+`sQH?{`ahhSsls zhMJ$BQr{*wEzZl&pKtg5_unrMy%O3^Pv8IXY5TO(Kb0E-IT>2;pxTJv4Ewgvo;`aj zf1=@hyV_kpetdjd&nI|M>7tz08Ptsthep*E2k`IJ#eBNAdYtED6hAa@(|9e_wM_ zh~W?m(dZ4k!Qn092foni9$65b=)dz})JJY1|Fg-#?ro#%pa=5-*-TOZ(RI zGV{Rh-PXl@XJ*RHSd_Se!DpFpN#D!B2QRym&TW5Q5w++U}ee=xY6HOOxIDFD}X7Qxi&L<;T9y~o+`(fVXJ2F{q{0APY)YTf*zdnDq z^1jTu%LV@hUu->mKj(j$(*A$Z=jVJs|ImiFo|R$Gdp=FWW0cZ=fj|ovqJU2%DA_=e1CGk|9JiI;^q7tmV+GdWVSK-cZC}$?3oB5_xWsJ ztn!Mt861CoYWnB-{ml6{i42$=-*BXyd-i;Tj5X8D%|9*6Sfcu58_(SQ z1LW%-w`JfECK_#4o?tn9{^6p&cN{FyDeem{Z)9mOU<9EJi_IC|a^;*8d$#AE=#0x7 zwKo72K7RJ42oli1uqFnbS$E)BP95LrjoJo>H)?-)8NuW*g8_&PrW}51zufRH%N^UQ z9sBoxKioRwu;_tzzkXG{O>Q(VX8vFj_n$%jnw>(0a(o@I*dhx^T#fI0a9={W=tv<* Nzo)C8%Q~loCIGW{^O*nu diff --git a/resources/assets/storagedrawers/textures/gui/drawers_comp.png b/resources/assets/storagedrawers/textures/gui/drawers_comp.png index 125fc30384076cb6768caba6f20f83fcf99b2573..8f086a6df1b6eb5aed64fd9a5d78112ec85462f5 100644 GIT binary patch delta 1153 zcmV-{1b+Md3y2JmEC?P1Hy(4B+If*QD1VnpL_t(|+U?y@PU31D#$h1t#3h(`q1(_s zcuV3wxOES>4ooyI!L8`=^GIM&P%NeW`aVxG;f!bIKg6^@+9F@aqm{Q2)M32*kDHsD zM%(S(-QBp!->==t=i}SEuAdA1%6L338*B8Adnl8UouA4q7K`#=qdkC=%`ZGWJRWrY zoM5NfY&N>Sz8=lza}j80vi=)8KV+FS9|6=#liLIyf3TD0BkD4pPP={zt+~3o8eLvq zcKtMt>iPNk`#9$UE~qK>+9^re(_4Ka@I3*bdcS?2 zUj)7q0IIg{5BZ3|zXX6m*ynwIKNGOx2Z5;Cf78>``17&rr&1+H01!+7AeaC^FadyI z0sz4T0D^fNuz|7`K=Mkw)K35!C@c9`%!8Ua1%P1DM*w9>?Xs#aq>2teVM%S0dHI82 z(MJGn-Wh29jy=cvcVJ)90VvwKiobcso@4zxun(sI5G?)(VCh(Q`EfTP`a}TM9P2JW z2JR+AUpNJm5CRyJ4+0iK^#DE{>n=a;CPbeIz^7x~<;UHG=o6;^5G?u#;8=GCat9*% zDmnngv6j@fbT@tEWeI}C9Raus4=Zs2a1|a_oC1^I1SEe|^?r1JpX1Y#Ih+DOFadyI0sz4V7l4g9*TL<1U(PI1Och&MOpZC^L%Z*v%?>V6Pt z)AE(=yA4ly^HtBBzt3Tqsy_k%{!RcOSoNm>>-zRy`B3LD9D@nKq0VQ`A&FA}2qpj! ztg2IhL*3fj9Qfb({ny*OkKb4bf*QLT|blY11TN(X+XE*Hm47B+^)Pm zKYkpzPq(c$Cv%QZskX-{k^(4`4*~`$cCH7|x7${mlR1a>?7Tg=6@kp@!<@|(f!rSa zaI6SqPVeVf5vV<`0h8YZCnOU92qpj!%!)wf^nMQQu_BN;y`N)6p!Qf1$eiBKu_91= zTmzF30vMAI0v0qCfz0Xs9NM#UMIh)SD*_#kQve7i01!+7AlS}}fK~-Irw?;BR|V#9 ztO{&S@8`HU-5#ft@dOocCi00000NkvXXu0mjf!rdkV delta 1150 zcmV-^1cCdA4E+m`EC>q*2Q(8YR-chHD1VGeL_t(|+U?!pP1{@;hT#Nt6K0@4U=73` zkzfjbWDmj|L4p}r1wKwbB0`#k1jn(DpX-vUv{m~ys_Z+q!N=p#m-i9WVZ8jw#l^*9 zyS=%&IcUJc!^7hB<>h63&|e&wKcBDfAG&@ou$S?8TsGEkJ8s#b_l>}E=VvrJ8-LmP zsmy#nFE9Um^6#@_ul|`sj~a%kRPVYOa5nAecK*!-0D=hs zgY(lxK)wh7gR*|kf9UrKq!9oHV}IKPKM~kY02qXyuJ((-W&%L<_We?y2>eR`sM?`l z=NEzR1b{&}#tC*aGU<|FDdnM}HV3$3}nz8+m&U3L97PHK5S|Ho_BZ>36c0Vv+y z-nxDZt+>6tbwd{iaS8yzB98!;o}Zt)ehZEL{rk7;w?M_B15ng{$b5EoHX+zk8rtU+ z0D{FI0W@)puP7v5xu-t_prNt@H{r@XU2+PO5Ca~Qy#xu99s>tw>j5-S)&eN^^Fyr! zpnO!jM02G$gCYg^v2o`+=(B_kYR-f2&s(%L#6&--0 zt*iL!PwY9>zXOMG3IM_4j{ufV^^_k^6QWN9V8yAP^5bbj^o3KC@B|{0uL2B0Sr6dT zsh;xVX+rdg0DL;tQ+_;6h(2)&0KuY<08aH}AWtBouc8A`oN7sJOLx;pK9(R@+!27Q z@bD!r0ItHr7pIdC1QnCO1O}5H0}6jt-3&CDOd8K9cLP2?KAN**PPt)<3{?f7C>v-K zQ4by_3dlrL!HBL3?=}_I-fO%Bu)V!m;gYqs!jop^=NN%;D6(f zAMYO)zpxMlHJDDPi`Us~R$j(kzmxm}DI9q>pvQ5W(}y`8SKgiuRs=Gq_j9ZW)E+AWnbZ3@Rs?E~Ym*NI6_daO29q8G z5I6|{1hXQLIlZ4ldv>k}1bt*hpyP200Ko(Rf(ZZw+j$Yts=(&-Vb1!hz#NZNfz9dt z92ckC;}nyi0w|NO0tQ7^1vaPmb7+rMfvJvFfse;200a{N2qpkjWqJ6|ag>XI;}7ri z`P_dlgjpT|j4v-QyM8aQHx~epWBotyz3Vpwd$RKblfeZrlh6eR7(lK5193@F{hyE* QIsgCw07*qoM6N<$f;~|hM*si- diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java index fe0672a..c38c794 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java @@ -502,7 +502,7 @@ public class TileEntityCompDrawers extends TileEntityDrawersBase implements ISto @Override public void setInventorySlotContents (int slot, ItemStack itemStack) { - if (slot < 0 || slot >= getSizeInventory()) + if (slot < 0 || slot >= getSizeInventory() || itemStack == null) return; int insertCount = itemStack.stackSize; diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 3786064..c6238b7 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -288,7 +288,7 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public String getInventoryName () { - return null; + return "container.drawers"; } @Override @@ -303,7 +303,11 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public boolean isUseableByPlayer (EntityPlayer player) { - return false; + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) + return false; + + return player.getDistanceSq(xCoord + .5, yCoord + .5, zCoord + .5) <= 64; + } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java index 89cb09c..9d3ac6b 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java @@ -20,12 +20,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import java.util.List; + public class GuiDrawers extends GuiContainer { private static final ResourceLocation guiTextures2 = new ResourceLocation("storagedrawers", "textures/gui/drawers_2.png"); private static final ResourceLocation guiTextures4 = new ResourceLocation("storagedrawers", "textures/gui/drawers_4.png"); private static final ResourceLocation guiTexturesComp = new ResourceLocation("storagedrawers", "textures/gui/drawers_comp.png"); + private static final int smDisabledX = 176; + private static final int smDisabledY = 0; + private static final Object[] empty = new Object[0]; private static RenderItem storageItemRender = new StorageRenderItem(); @@ -75,6 +80,15 @@ public class GuiDrawers extends GuiContainer int guiX = (width - xSize) / 2; int guiY = (height - ySize) / 2; drawTexturedModalRect(guiX, guiY, 0, 0, xSize, ySize); + + if (inventorySlots instanceof ContainerDrawers) { + ContainerDrawers container = (ContainerDrawers) inventorySlots; + List storageSlots = container.getStorageSlots(); + for (int i = 0, n = storageSlots.size(); i < n; i++) { + Slot slot = container.getSlot(i); + drawTexturedModalRect(guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16); + } + } } private RenderItem setItemRender (RenderItem renderItem) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java index d1302b9..12d2775 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java @@ -35,7 +35,7 @@ public class ContainerDrawers extends Container storageSlots = new ArrayList(); for (int i = 0; i < tileEntity.getDrawerCount(); i++) - storageSlots.add(addSlotToContainer(new Slot(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); + storageSlots.add(addSlotToContainer(new SlotStorage(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); upgradeSlots = new ArrayList(); for (int i = 0; i < 5; i++) @@ -60,6 +60,10 @@ public class ContainerDrawers extends Container return 0; } + public List getStorageSlots () { + return storageSlots; + } + @Override public boolean canInteractWith (EntityPlayer player) { return storageInventory.isUseableByPlayer(player) || upgradeInventory.isUseableByPlayer(player); diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java index 799d69f..eff63b0 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java @@ -1,16 +1,58 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase; +import cpw.mods.fml.common.asm.transformers.ItemStackTransformer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; public class InventoryStorage implements IInventory { + private static class InventorySnapshot { + private ItemStack[] snapshotItems; + private int[] snapshotCounts; + + public InventorySnapshot (int size) { + snapshotItems = new ItemStack[size]; + snapshotCounts = new int[snapshotItems.length]; + } + + public ItemStack takeSnapshot (ItemStack stack, int slot) { + if (stack != null) { + snapshotItems[slot] = stack; + snapshotCounts[slot] = stack.stackSize; + } + else { + snapshotItems[slot] = null; + snapshotCounts[slot] = 0; + } + + return stack; + } + + public int getDiff (int slot) { + if (snapshotItems[slot] == null) + return 0; + + return snapshotItems[slot].stackSize - snapshotCounts[slot]; + } + + public int splitDiff (int slot) { + int diff = getDiff(slot); + if (diff != 0) { + snapshotCounts[slot] = snapshotItems[slot].stackSize; + } + + return diff; + } + } + private TileEntityDrawersBase tile; + private InventorySnapshot snapshot; public InventoryStorage (TileEntityDrawersBase tileEntity) { tile = tileEntity; + snapshot = new InventorySnapshot(tile.getSizeInventory()); } @Override @@ -27,12 +69,12 @@ public class InventoryStorage implements IInventory stack = stack.copy(); stack.stackSize = tile.getItemCount(slot); - return stack; + return snapshot.takeSnapshot(stack, slot); } @Override public ItemStack decrStackSize (int slot, int count) { - return tile.decrStackSize(slot, count); + return snapshot.takeSnapshot(tile.decrStackSize(slot, count), slot); } @Override @@ -57,11 +99,18 @@ public class InventoryStorage implements IInventory @Override public int getInventoryStackLimit () { - return Integer.MAX_VALUE; + int limit = tile.getInventoryStackLimit(); + return (limit > 64) ? 64 : limit; } @Override public void markDirty () { + for (int i = 0, n = getSizeInventory(); i < n; i++) { + int diff = snapshot.splitDiff(i); + if (diff != 0) + tile.getStackInSlot(i).stackSize += diff; + } + tile.markDirty(); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java new file mode 100644 index 0000000..0b34aa7 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java @@ -0,0 +1,17 @@ +package com.jaquadro.minecraft.storagedrawers.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +public class SlotStorage extends Slot +{ + public SlotStorage (IInventory inventory, int index, int x, int y) { + super(inventory, index, x, y); + } + + @Override + public boolean canTakeStack (EntityPlayer player) { + return false; + } +}