From f60106f0e9a583bf3e0f33351306048eb03c7a48 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 27 Oct 2013 15:00:22 -0400 Subject: [PATCH] Filter panel buttons render! --- .../client/gui/GuiLogisticalSorter.java | 48 ++++++++++++++++++ .../mekanism/gui/GuiLogisticalSorter.png | Bin 3576 -> 3652 bytes 2 files changed, 48 insertions(+) diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java index 5a6d8000f..96c44dd05 100644 --- a/common/mekanism/client/gui/GuiLogisticalSorter.java +++ b/common/mekanism/client/gui/GuiLogisticalSorter.java @@ -62,6 +62,20 @@ public class GuiLogisticalSorter extends GuiMekanism dragOffset = yAxis - (getScroll()+18); isDragging = true; } + + for(int i = 0; i < 4; i++) + { + if(tileEntity.filters.get(getFilterIndex()+i) != null) + { + int yStart = i*29 + 18; + + if(xAxis >= 56 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+29) + { + TransporterFilter filter = tileEntity.filters.get(getFilterIndex()+i); + System.out.println(getFilterIndex()+i); + } + } + } } @Override @@ -132,6 +146,26 @@ public class GuiLogisticalSorter extends GuiMekanism fontRenderer.drawString("IS: " + getItemStackFilters().size(), 11, 37, 0x00CD00); fontRenderer.drawString("OD: " + getOreDictFilters().size(), 11, 46, 0x00CD00); + for(int i = 0; i < 4; i++) + { + if(tileEntity.filters.get(getFilterIndex()+i) != null) + { + TransporterFilter filter = tileEntity.filters.get(getFilterIndex()+i); + int yStart = i*29 + 18; + + if(filter instanceof ItemStackFilter) + { + fontRenderer.drawString("ItemStack Filter", 58, yStart + 2, 0x404040); + fontRenderer.drawString("Color: " + filter.color.getName(), 58, yStart + 11, 0x404040); + } + else if(filter instanceof OreDictFilter) + { + fontRenderer.drawString("OreDict Filter", 58, yStart + 2, 0x404040); + fontRenderer.drawString("Color: " + filter.color.getName(), 58, yStart + 11, 0x404040); + } + } + } + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -148,12 +182,26 @@ public class GuiLogisticalSorter extends GuiMekanism drawTexturedModalRect(guiWidth + 154, guiHeight + 18 + getScroll(), 232, 0, 12, 15); + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + for(int i = 0; i < 4; i++) { if(tileEntity.filters.get(getFilterIndex()+i) != null) { TransporterFilter filter = tileEntity.filters.get(getFilterIndex()+i); int yStart = i*29 + 18; + + boolean mouseOver = xAxis >= 56 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+29; + + if(filter instanceof ItemStackFilter) + { + drawTexturedModalRect(guiWidth + 56, guiHeight + yStart, mouseOver ? 0 : 96, 166, 96, 29); + } + else if(filter instanceof OreDictFilter) + { + drawTexturedModalRect(guiWidth + 56, guiHeight + yStart, mouseOver ? 0 : 96, 195, 96, 29); + } } } } diff --git a/resources/assets/mekanism/gui/GuiLogisticalSorter.png b/resources/assets/mekanism/gui/GuiLogisticalSorter.png index 07db177e3224cfc3567366a0fb17b3c4816ae333..73e9ac2586bcbf90cf156ed08c2f064586f0cd71 100644 GIT binary patch literal 3652 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 JYY&G0_HSNBBD4Si