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

reformat + optimize imports

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-29 12:04:22 +01:00
parent 62d3f0436c
commit b4c3a32806
84 changed files with 178 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,5 @@
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;
@@ -26,6 +21,12 @@ 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;
@@ -132,8 +133,7 @@ public class GuiGrid extends GuiBase
if (grid.getType() == EnumGridType.CRAFTING)
{
bindTexture("gui/crafting_grid.png");
}
else
} else
{
bindTexture("gui/grid.png");
}
@@ -306,16 +306,13 @@ public class GuiGrid extends GuiBase
if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null)
{
StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1));
}
else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
} else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
{
StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, clickedButton == 1, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
}
else if (clickedClear)
} else if (clickedClear)
{
StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
}
else
} else
{
for (Slot slot : container.getPlayerInventorySlots())
{
@@ -341,8 +338,7 @@ public class GuiGrid extends GuiBase
{
if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode))
{
}
else
} else
{
super.keyTyped(character, keyCode);
}