From b1026bef2559e2738aaca25b545d435ac61cff2a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 2 Jan 2016 23:29:35 +0100 Subject: [PATCH] redstone side buttons --- .../gui/sidebutton/SideButtonRedstoneMode.java | 5 ++--- .../assets/storagecraft/lang/en_US.lang | 12 ++++++------ .../assets/storagecraft/textures/icons.png | Bin 0 -> 2583 bytes .../assets/storagecraft/textures/sidebuttons.png | Bin 289 -> 0 bytes 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/storagecraft/textures/icons.png delete mode 100644 src/main/resources/assets/storagecraft/textures/sidebuttons.png diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java index ca4a41434..3cc531a72 100755 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java @@ -1,7 +1,5 @@ package storagecraft.gui.sidebutton; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import storagecraft.StorageCraft; import storagecraft.gui.GuiBase; @@ -32,7 +30,8 @@ public class SideButtonRedstoneMode extends SideButton @Override public void draw(GuiBase gui, int x, int y) { - gui.drawItem(x, y, new ItemStack(Items.redstone, 1)); + gui.bindTexture("icons.png"); + gui.drawTexturedModalRect(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); } @Override diff --git a/src/main/resources/assets/storagecraft/lang/en_US.lang b/src/main/resources/assets/storagecraft/lang/en_US.lang index 46edf1541..f433a01c7 100755 --- a/src/main/resources/assets/storagecraft/lang/en_US.lang +++ b/src/main/resources/assets/storagecraft/lang/en_US.lang @@ -36,9 +36,9 @@ sidebutton.storagecraft:compare.1=Compare Damage sidebutton.storagecraft:compare.2=Compare NBT sidebutton.storagecraft:redstone_mode=Redstone Mode -sidebutton.storagecraft:redstone_mode.0=Ignore -sidebutton.storagecraft:redstone_mode.1=High -sidebutton.storagecraft:redstone_mode.2=Low +sidebutton.storagecraft:redstone_mode.0=Ignore redstone signal +sidebutton.storagecraft:redstone_mode.1=Only work with redstone signal +sidebutton.storagecraft:redstone_mode.2=Only work without redstone signal sidebutton.storagecraft:sorting.direction=Sorting Direction sidebutton.storagecraft:sorting.direction.0=Ascending @@ -53,9 +53,9 @@ sidebutton.storagecraft:importer.mode.0=Whitelist sidebutton.storagecraft:importer.mode.1=Blacklist sidebutton.storagecraft:detector.mode=Mode -sidebutton.storagecraft:detector.mode.0=Under the amount -sidebutton.storagecraft:detector.mode.1=On the amount -sidebutton.storagecraft:detector.mode.2=Above the amount +sidebutton.storagecraft:detector.mode.0=Emit signal when under the amount +sidebutton.storagecraft:detector.mode.1=Emit signal when on the amount +sidebutton.storagecraft:detector.mode.2=Emit signal when above the amount block.storagecraft:controller.0.name=Controller block.storagecraft:controller.1.name=Creative Controller diff --git a/src/main/resources/assets/storagecraft/textures/icons.png b/src/main/resources/assets/storagecraft/textures/icons.png new file mode 100644 index 0000000000000000000000000000000000000000..35dcd6fcb4e4f4244ad7204dfd49dcfde36c0dce GIT binary patch literal 2583 zcmeHISy+?T7CnFR10lg)tXRNONP876)g%lu1Ofp=AwUR1D2QGLiGX55EI}!t`P1Nl z6r`n=i$YPU)mlKnUcgdGuqDhQNSQO(P|6er6#|5ihW7Qo-lyC3efv9S?K3>Az1KN8 zA;ErIusg5-fGu=?S||XJehL8$T0bOLM6xznYN($NsCr^Gr6+KrH^Uo%nk%^VI0FFC zAS8(8tIwlQC^Q-k!?1yYfuW(Hk&zJwgE2NXwz9G^@dA4Q*kg@zu`_r3=Ns;XH$8|} z6w+G+0)a>*l1LCr)rUoRpLlE|+`i)F~d1mywa-&<*YbfCLkA z5_cD-(ypexUv$R*-|6%+en`)DlokNp6`&ge2!aR%g8cma^78VEii*n0%BrfW`}glx zihiuCtE(10YHVz5YHF%&Zqn(Bnwy)&tt}FXq_wrRt*x!Sy}hHOqqDQKtE;PRpue}b z_vt`?-@q?=^bHLRjt&nE4ULVBNu^SmOeUAhrO)LGh2r`1=L+SoN~Lmqe0)NWnW@Ri z$!R@iXXfVS78e(nmX?;6m(^gwv++L~6Y)#-Hl()^A8wF0!)>(Vz}!wU@#(`)|! z3=pO^+NIaqnCpKi6@b@%+6<^Q6e}+(v2x;;YyZb~E#$+= zZ=s@apLFxjQq;1uG11oJHVvAr1rsbpVdVnqntq#RsW_eW#*h zS_{a*$Y=(Kz{5oHHI*Fn;?np6imiI6$?Ar)dI=cuO#4C6q)%)nHOeF8swDIGV_bFo0}JcFUkxXn_oJ8QSkj;uyfx*vBc0Y z0>)2irVlFw!Vetwq~Lj77gyAKH&FcieGQv zCH1E?3`~KRZeq1hJl_+C$8b|Jzl38d{*{febnbhZeh5yt z2S%G{jG(!diwVy#j-*v_l&n=|Q4Bjaljfp-~laMw%zPWWJ&?Z{mwA6*uq!Dj;a>%7ramS0F z-6NcJ4cg&f9<}zA)l1R})3A`ReE!_JbiPuh*1zN>V9NG13StH^y&Ov87?XzjWBvVR zU!IM8Kly13G6SP*ch`@^CV$j-Z76SE&umAoM^FYwmC6COv>_NDd$P-h+cSB0e<|nd zZ5Rv7<1wSJvYuI6*VztsFOUSt&6|96GhZki7;m)PX-aZUcdS*xytE5Up~1qtu4v}& z+zlU?j)VKNNd`MmlAm)>BdU=k3rgPfBNmFyw^#UGndPs$UKB*5?(MyUm@CvhmPxOc z!Zr88v1olaiY9Cxr{-PWE1&%C0}FknZZKh161;*F<1mIheyg38?TNT|42AYHzRR*Z zwl$=RRD!ylZe(&vAgTGZqvq8X7&6*0acwhB!Y{;6h2B%uEk{+l|7T=QRXQM(?g$1L ze>wHr<*B?Fj%wC=OxpM$RoO~R&dbcMUbipCz-C+<;S0s@pSOs%bqVD{wqlCy<^wK( z9K_K)f$24UXMti@`s8f|OH<~>*Cd}l=bbP-G)``}T;vqMA%hsh@cLaSpTT>Wt^flSl7tB@utuv|kBMyf}8_0j5Ctp=!7%u^d@7pbygF z1|_lnu?>NW%t+3>25qe5BFn{iJWokJk8sz|hrM7r=S%$)O%dfk*0o;OE#V(adgVm2 z$>pc=m=&4I?A`P8xSUHM2-0eRCv3D6Lj7f_zv+Kb!-pUq(Lve~x5P`~ R>5|P)lI|N!tMZBc0#LT=By}Z;C1rt33 zJ+nVO$@hV3CV9FzhE&8oJz>bmz`%2O!B6wMk{!%^a(U9a!ILykPD$}HQk^-;$8(tq deYnTpG3rgZbVy%8^)JwM44$rjF6*2Ung9|EU*`Y-