From f57b88c1c9c58f9f3fffafebe6ccb3688518b0a1 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 22 Mar 2016 19:03:58 +0100 Subject: [PATCH] Use GuiScreen.isShiftKeyDown(), add scrollbar textures --- .../container/ContainerBase.java | 4 ++-- src/main/java/refinedstorage/gui/GuiGrid.java | 8 ++++---- .../textures/gui/crafting_grid.png | Bin 2036 -> 2141 bytes .../refinedstorage/textures/gui/grid.png | Bin 1869 -> 1994 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java index 2082a1c5b..85a14dc93 100644 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -2,12 +2,12 @@ package refinedstorage.container; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import org.lwjgl.input.Keyboard; import refinedstorage.container.slot.SlotDisabled; import refinedstorage.container.slot.SlotSpecimen; @@ -82,7 +82,7 @@ public abstract class ContainerBase extends Container } else if (slot.getStack() != null) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if (GuiScreen.isShiftKeyDown()) { slot.putStack(null); } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 2cad2789a..db3f5f387 100644 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -6,12 +6,12 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.Slot; -import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import refinedstorage.RefinedStorage; import refinedstorage.block.EnumGridType; @@ -40,7 +40,7 @@ public class GuiGrid extends GuiBase public GuiGrid(ContainerGrid container, TileGrid grid) { - super(container, 176, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); + super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); this.container = container; this.grid = grid; @@ -301,7 +301,7 @@ public class GuiGrid extends GuiBase else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) { boolean half = clickedButton == 1; - boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); + boolean shift = GuiScreen.isShiftKeyDown(); boolean one = clickedButton == 2; RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); @@ -316,7 +316,7 @@ public class GuiGrid extends GuiBase { if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if (GuiScreen.isShiftKeyDown()) { RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); } diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png index a908b1468e8408ed43547368a7b07d8afb263992..522b89053e8ccf315f25fd3388c3b95b4cb42a7e 100644 GIT binary patch delta 1022 zcmeyue^+2b2n*Li1_r)^j5{V~znvV%B42NrV_fIQz`%Ui)5S5QBJSMpa^9?6ZL_^F45P^=8*7{I9o+W& zZ9|-J{p|96r=;I8>=pl9$3G#7eFL+}bK^1w>jv2ad>xDv>MqS+E8osoG1c_Iuj1U> zU--7&<$v&q!GQV4E%O(%em|agSnIi-M2f88~h@R`qHg;J?nDY!)Q{UeX7v-dM{XQjvFIX6T@APTrl(Vl{$6H zFy(U$R^=xx=e>O~OIzwA+l4in$Ir%?gRElMAjt~TQ=+^Ttp7~#@3~JRdM%h=+);gA zv2Ahox{M>z4x5+Bm>1s#xrE_Bng~qKh5FtrY#@$-|J(9O$)-gyOEn!9GYZHg{41*1 zHSv}dbHqNj2fHE|cD)SUzxV$$hA;oQmXt_;HDzB=IvZ^Bf}7GnL)S51xcq77CH0Tf z{X_rT&dtBKl)^ckb%|E$>pOX)J{ywj1FXoV6mtil@AkK8fzVm$Af9vibkIYFZ%hvvzHGXp&YTk+=WTz2 zmHEQs(2WdV3Su=FY;TEhI`D5}Wx7xrUN6%iepjeLcwy}vj;TE_dhhcv?ESe=gW>pn z@48Fcf4;0_I0_2XsO^zJl7V4Xtu(`~<-p*3;mFm{&$i=}%ZeS^jCqnkDbxUgc&UNa z!T-bau76ey>nx88<}=7+_ZV(vB2ouPVaDAwxOEIaASq)D$T*;bzcQyU z*nEA?7@oym@H)Nd?W|?_vG)U0*UPa8gKYP7^>bP0l+XkK5qgPb literal 2036 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJwV*yb`^<)Di^~Jp(y_izzusLukB2GNSN{KF^SA_-A8VK1){RMExNui{1yjT9)xS%=e`dbp+q;_u=!7lr zHvmZnhGTQtSsT7d$LTVBe|g)?`S4wBh7W8F{14J^#$LZ;zkUbfmz`=~EpCI#LNHiR z+YT)5pkTwir*m_U@+{ctea_i*1W*yev=a~tEAt%*S4PzDQ7$q%ur;XnI~e@{1D z{8WAFG}DW_;kxhH4>U6Tjz98$U-7(#)T95`KK^}fZB zY-72_bVDG6CqcI$mBH4~|NPQf%n@8B>|18CHp)}B%LEcK0L3m-RPm5RBmvixK4fkq8wHaQYS6%;wZT&i~02!eBU{SMR z_jzUq`Cwp_eNkXNu#~ZH4u@#D$^lJ;9~c-)zH@AmXjH z4xG(!UqwCZC{KVpP^96T>@{wO&DZA??pvL`F5@Wgg7s#akHxptYQvNRRfxgZ3=R3S zq_-xqtx#rQ$dG=J#`vP`cUZ8^fzR9D#X8SrPOxCzYLaWUZr^`qy>o1#KLVr|gLHbj L`njxgN@xNAT?S2^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)(vj25iHzyM;9C~=J_3C>R|DNig)Whh9@%q!8$OD$0_(KFDq%rUO> z0~RO-o-U3d6>)FxzV5qhAmH$Dg30^;Czb~Cm+5nJ-IH8l`kW&(?B7FQI~{>*t8}iv zHY&V+`R(4`$}PIrTlJT}*>j*SbM5bIQPWr6uirmM?1uiHPh|{iSQw0ix2;QO{a3;i zF@NKJ#s^dPTQKH`2}vK{{*iay?>)jBHWgOH+dpNW$FR@4;y!yuC6f)~o66I|4>&)t zR4`>RY`Om>x<7t8wnB^ziGX767PX^ zYmXeZ*`@?i`eBO}SO<{!ptP71q+KTZ`Q0ZjYgL#F-e2_hQu;)Yu*v{kED$OkewNEnK+5JW6ec6n?!P++&-rVxCIg<=>TmysuYM9$# z4n453^q#NZl~cci+n9W2F&t&=>p%S1)onJ zOwJcRLGx9?rKryK${bgau?|o(K{S|iV)x0;C{MNr_m)nt*narU+^Cam50-2d;{SZ3 z3ufqn;&xS7@NrBipDes}5|4p9#O7=I4DaHqJHPLSxb5GzOx1s_W{^+^1>c7|iQwP{ zN7<9R&)k4+J2R1i=?YuN4~@6ir=?nco4c%{;kN#_c?%o(h3jA5`0&s0X>dvXixWcI q=4dm{NEL2~G@}=_?GeNE*ZzmzKXMa&<$V-X)_S`7xvX2^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5z`qj9J$@Ie~%_C9V-A!TD(=<%vb93~dIoxCe|nPd zGcYi1_H=O!sfc@f>tdFOqd?om!s~nfE3eP{WX)S;%o93e*}3+B0CDH)3?4Jfxb?~N z)u^@9H{q!?ZkES4CV&+@bl}}*Vi|s2hU&5!oc8g zE>;YbDr@HL(O|I5uiVXGv;W`iYZrdMmS*_Ewt)Y^@%y&M;r}Zy^G>MGK4-V@HXBGa z5KJhZ4lM5=;KTdqd*!!Hn4jEDz4~L@0EbzsUH_D!F& z%GcQ8UTj!zzV*!2-m~)>?rhn7>~u{&sAL6!6FW~cL0Ak7FRD+jyhW