dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use inBounds + always play click noise on clear btn in grid

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-23 16:00:56 +01:00
parent 532574a1b8
commit c4bcba1ed6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/storagecraft/gui/GuiGrid.java
View File

@@ -119,8 +119,7 @@ public class GuiGrid extends GuiBase
public boolean isHoveringOverClear(int mouseX, int mouseY) public boolean isHoveringOverClear(int mouseX, int mouseY)
{ {
// @TODO: Use inBounds return inBounds(81, 105, 7, 7, mouseX, mouseY);
return mouseX >= 81 && mouseX <= 87 && mouseY >= 105 && mouseY <= 111;
} }
@Override @Override
@@ -284,6 +283,8 @@ public class GuiGrid extends GuiBase
{ {
super.mouseClicked(mouseX, mouseY, clickedButton); super.mouseClicked(mouseX, mouseY, clickedButton);
boolean clickedClear = grid.isCrafting() && clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop);
if (grid.isConnected()) if (grid.isConnected())
{ {
TileController controller = grid.getController(); TileController controller = grid.getController();
@@ -296,11 +297,9 @@ public class GuiGrid extends GuiBase
{ {
StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.xCoord, controller.yCoord, controller.zCoord, hoveringId, clickedButton == 1, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))); StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.xCoord, controller.yCoord, controller.zCoord, hoveringId, clickedButton == 1, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
} }
else if (clickedButton == 0 && grid.isCrafting() && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop)) else if (clickedClear)
{ {
StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
} }
else else
{ {
@@ -316,6 +315,11 @@ public class GuiGrid extends GuiBase
} }
} }
} }
if (clickedClear)
{
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
}
} }
@Override @Override