From 830f5f6ea0357e33b4d307b810f28cd447ced5b6 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 27 Jan 2016 15:53:31 +0100 Subject: [PATCH] fix bug where there is light on side btns --- src/main/java/storagecraft/gui/GuiBase.java | 7 +++++++ .../java/storagecraft/gui/GuiConstructor.java | 2 +- .../java/storagecraft/gui/GuiController.java | 4 ++-- .../java/storagecraft/gui/GuiDestructor.java | 2 +- .../java/storagecraft/gui/GuiDetector.java | 5 ++--- src/main/java/storagecraft/gui/GuiDrive.java | 2 +- .../java/storagecraft/gui/GuiExporter.java | 2 +- .../storagecraft/gui/GuiExternalStorage.java | 2 +- src/main/java/storagecraft/gui/GuiGrid.java | 13 ++++++------- .../java/storagecraft/gui/GuiImporter.java | 2 +- .../java/storagecraft/gui/GuiSolderer.java | 4 ++-- .../gui/GuiWirelessTransmitter.java | 4 ++-- .../gui/sidebutton/SideButtonCompare.java | 2 +- .../SideButtonGridSortingDirection.java | 2 +- .../sidebutton/SideButtonGridSortingType.java | 2 +- .../sidebutton/SideButtonImporterMode.java | 2 +- .../sidebutton/SideButtonRedstoneMode.java | 2 +- .../assets/storagecraft/textures/icons.png | Bin 2564 -> 2561 bytes 18 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java index 301f47fbc..01e54805b 100644 --- a/src/main/java/storagecraft/gui/GuiBase.java +++ b/src/main/java/storagecraft/gui/GuiBase.java @@ -72,7 +72,9 @@ public abstract class GuiBase extends GuiContainer for (SideButton sideButton : sideButtons) { + GL11.glDisable(GL11.GL_LIGHTING); sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); + GL11.glEnable(GL11.GL_LIGHTING); if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) { @@ -194,6 +196,11 @@ public abstract class GuiBase extends GuiContainer renderToolTip(stack, x, y); } + public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) + { + this.drawTexturedModalRect(x, y, textureX, textureY, width, height); + } + public String t(String name, Object... format) { return StatCollector.translateToLocalFormatted(name, format); diff --git a/src/main/java/storagecraft/gui/GuiConstructor.java b/src/main/java/storagecraft/gui/GuiConstructor.java index e3a128052..5eb84749a 100644 --- a/src/main/java/storagecraft/gui/GuiConstructor.java +++ b/src/main/java/storagecraft/gui/GuiConstructor.java @@ -36,7 +36,7 @@ public class GuiConstructor extends GuiBase { bindTexture("gui/constructor.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiController.java b/src/main/java/storagecraft/gui/GuiController.java index dd7532251..1b79650da 100644 --- a/src/main/java/storagecraft/gui/GuiController.java +++ b/src/main/java/storagecraft/gui/GuiController.java @@ -36,11 +36,11 @@ public class GuiController extends GuiBase { bindTexture("gui/controller.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); - drawTexturedModalRect(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); } @Override diff --git a/src/main/java/storagecraft/gui/GuiDestructor.java b/src/main/java/storagecraft/gui/GuiDestructor.java index 0c2b6f8cb..24a760e64 100644 --- a/src/main/java/storagecraft/gui/GuiDestructor.java +++ b/src/main/java/storagecraft/gui/GuiDestructor.java @@ -31,7 +31,7 @@ public class GuiDestructor extends GuiBase { bindTexture("gui/destructor.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiDetector.java b/src/main/java/storagecraft/gui/GuiDetector.java index 6f5c6e46c..10ba333cf 100644 --- a/src/main/java/storagecraft/gui/GuiDetector.java +++ b/src/main/java/storagecraft/gui/GuiDetector.java @@ -1,6 +1,7 @@ package storagecraft.gui; import com.google.common.primitives.Ints; +import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import storagecraft.StorageCraft; import storagecraft.container.ContainerDetector; @@ -10,8 +11,6 @@ import storagecraft.network.MessageDetectorAmountUpdate; import storagecraft.tile.TileDetector; import storagecraft.util.InventoryUtils; -import java.io.IOException; - public class GuiDetector extends GuiBase { private TileDetector detector; @@ -52,7 +51,7 @@ public class GuiDetector extends GuiBase { bindTexture("gui/detector.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); amountField.drawTextBox(); } diff --git a/src/main/java/storagecraft/gui/GuiDrive.java b/src/main/java/storagecraft/gui/GuiDrive.java index b348f5e10..327f2be69 100644 --- a/src/main/java/storagecraft/gui/GuiDrive.java +++ b/src/main/java/storagecraft/gui/GuiDrive.java @@ -31,7 +31,7 @@ public class GuiDrive extends GuiBase { bindTexture("gui/drive.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiExporter.java b/src/main/java/storagecraft/gui/GuiExporter.java index 54949e87c..8e65480f9 100644 --- a/src/main/java/storagecraft/gui/GuiExporter.java +++ b/src/main/java/storagecraft/gui/GuiExporter.java @@ -36,7 +36,7 @@ public class GuiExporter extends GuiBase { bindTexture("gui/exporter.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiExternalStorage.java b/src/main/java/storagecraft/gui/GuiExternalStorage.java index 550cc0ad6..421a1b81e 100644 --- a/src/main/java/storagecraft/gui/GuiExternalStorage.java +++ b/src/main/java/storagecraft/gui/GuiExternalStorage.java @@ -31,7 +31,7 @@ public class GuiExternalStorage extends GuiBase { bindTexture("gui/external_storage.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java index 7ee4c0da3..6944ca616 100644 --- a/src/main/java/storagecraft/gui/GuiGrid.java +++ b/src/main/java/storagecraft/gui/GuiGrid.java @@ -1,5 +1,10 @@ package storagecraft.gui; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; @@ -21,12 +26,6 @@ import storagecraft.storage.StorageItem; import storagecraft.tile.TileController; import storagecraft.tile.TileGrid; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; - public class GuiGrid extends GuiBase { public static final int SORTING_DIRECTION_ASCENDING = 0; @@ -139,7 +138,7 @@ public class GuiGrid extends GuiBase bindTexture("gui/grid.png"); } - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); searchField.drawTextBox(); } diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java index e3d64acac..4734f67ee 100644 --- a/src/main/java/storagecraft/gui/GuiImporter.java +++ b/src/main/java/storagecraft/gui/GuiImporter.java @@ -39,7 +39,7 @@ public class GuiImporter extends GuiBase { bindTexture("gui/importer.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); } @Override diff --git a/src/main/java/storagecraft/gui/GuiSolderer.java b/src/main/java/storagecraft/gui/GuiSolderer.java index b384b87b0..ee41d85da 100644 --- a/src/main/java/storagecraft/gui/GuiSolderer.java +++ b/src/main/java/storagecraft/gui/GuiSolderer.java @@ -31,11 +31,11 @@ public class GuiSolderer extends GuiBase { bindTexture("gui/solderer.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); if (solderer.isWorking()) { - drawTexturedModalRect(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); + drawTexture(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); } } diff --git a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java b/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java index d778d2176..cc2b18455 100644 --- a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java +++ b/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java @@ -31,13 +31,13 @@ public class GuiWirelessTransmitter extends GuiBase { bindTexture("gui/wireless_transmitter.png"); - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + drawTexture(x, y, 0, 0, xSize, ySize); if (wirelessTransmitter.isWorking()) { int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); - drawTexturedModalRect(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); + drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java index 27d36400c..d4012b748 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java @@ -55,7 +55,7 @@ public class SideButtonCompare extends SideButton int tx = (setting.getCompare() & mask) == mask ? 0 : 16; - gui.drawTexturedModalRect(x, y + 2, tx, ty, 16, 16); + gui.drawTexture(x, y + 2, tx, ty, 16, 16); } @Override diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java index 6f709d579..c3c07e4cd 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java @@ -22,7 +22,7 @@ public class SideButtonGridSortingDirection extends SideButton public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - gui.drawTexturedModalRect(x, y + 2, GuiGrid.SORTING_DIRECTION * 16, 16, 16, 16); + gui.drawTexture(x, y + 2, GuiGrid.SORTING_DIRECTION * 16, 16, 16, 16); } @Override diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java index 1ee6371c9..f66292dca 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java @@ -22,7 +22,7 @@ public class SideButtonGridSortingType extends SideButton public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - gui.drawTexturedModalRect(x, y + 2, GuiGrid.SORTING_TYPE * 16, 32, 16, 16); + gui.drawTexture(x, y + 2, GuiGrid.SORTING_TYPE * 16, 32, 16, 16); } @Override diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java index ef4232bc1..490d1d244 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java @@ -31,7 +31,7 @@ public class SideButtonImporterMode extends SideButton public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - gui.drawTexturedModalRect(x, y + 1, importer.getMode() * 16, 64, 16, 16); + gui.drawTexture(x, y + 1, importer.getMode() * 16, 64, 16, 16); } @Override diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java index 3cc531a72..74adb6f6c 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java @@ -31,7 +31,7 @@ public class SideButtonRedstoneMode extends SideButton public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - gui.drawTexturedModalRect(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); + gui.drawTexture(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); } @Override diff --git a/src/main/resources/assets/storagecraft/textures/icons.png b/src/main/resources/assets/storagecraft/textures/icons.png index 101130760eca6035c91de5d1c0a7e88fd110296f..c1e2e651ce62a8a66fcfb5e520793a58f4a5c329 100644 GIT binary patch delta 1464 zcmZn>X%yL@!?;G+w{w1nN4tu&Dsyf;xJu%l!lkgN6#==N0j613f2~UU5P5%n(3<@0wfzm( znhriYKX2a5o5jV&-2V@}`MlQk+fB~>bKd)H;@A*m#Hu5y#1PyN;PC%k57Vz{eV>o9 zwOuJ>x^s=2d!h4zW7hfKr91l7+r{e@vh{5qWUDq|cA*>+$;M@E7ncfaJ_UET>5-xauNUI@=VVyaPy{JS!Zu`ovbfq zW9&WIEgyS(-_JYVbKAr(%rM#Or;t#Z`s(iK+4c8+{W*1Sa{BqG$Gc8iwKn|vQ9Zxr zzkBuXzdLtYsypoJoa=BPc=P7|vuP2+yByU842+GNQ{|^#lqxZNVAa_0^5t5+8?)wZ zQ!9IH-Po{l<-2F1=eNFlvcxpfe4Q}Ij2R!q@6;RH<@v6ce#ydg?AWewbKCo6?(S<( zmKs}mDI}yk+0XZ5f82Jp`@VA>9QM{JZ+gq}rL?WQne~I71#`K2_dh2VPi~egEe5Q! zn2sIkWZHH2R)vJ^*;juhrdb>{(YvN(?S8wr?04DPZPnS!_m(ejV`gA{ zDXnqUZuh^}XXoDiYhAs)eBJ*qp=&GW3rv%r(COg7_}xr{zkZ*7&pu;A03Kb^<_irBd?y>7`O^ZwuO>+kE&>+7A=k)9o+Zprxk{Cul#pZV7VLpnF7 zYOYH|^2h1x=TG|}y?geBN){bG*}q?`EAO@U`o1w?5_`Hw{`U`;vXi`4-3&YLU7PnS z$&M=`W>N`I+wOm#>Vtkfw&WmdKI;Vst0Dn1bQvd(} delta 1468 zcmcJOX;2df0EKs#HEcpekOWW|iB>r}2tmNmP;5{@VK8`A4k?LfFwBpn9D(`a|m`R26jLh7cT4#27qOW!2$mJPQ}cX=)(^L zQqFxsly+XX9it8IkCI@`uw=FB&o6r_79{F$mq#s4kG8Xp`qwSiRwcyGkBmf5I9$o- zXzJSHJ5it;4c-sAhWw0e*amY+7NqIX!riRC!Ea(X_wtx*Y*>)w#zP`deNBvsRy(DE z(73tV`t%++eZU35Cl!`(gzlxumbNfaI2~I!b&`d7XLec4r@r1Hb=pQrb~%q6boa{w zDZ)(wU`@lp94IQm1B(sIavuM_vrb5%wP$}YT~GRz`Yh;recj7*W2x8-3Uws zpg44oi9e<)e}LK4A)vBWHZokX0rWmBCnAJaneo?`s25~?pcm)H<6kXV%vgotu}Nsj zx91IQPP7yFi9YF)r4w$(6#``g&$i{8k|Rt57M_IA3>0evGB z>e~woS2?j-#icCV>cNBD(1Zx9R(~f8y0`ba!w#1RR`Wc@nIcS~s4*WZDrt1&Px^{5 zvAFj+wXdmn;g)wK-e~768x%qb(1P}$s6fnv-JX-PqRl#4I=RK}uGPG02Z z&9~VnA-8Csl&4i{j<4H~!$Uk@F>vo)AIHySg2888)gf0nK1M~$AHS@yD<1k9zTbWN z3++Jl>_t1CHF&bU#!t6+j6#>uW|(3CO*1^J)MV={##^SLyjO4_JK*M4?wP*;X3&b5