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

Crafting monitor fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-06 23:44:36 +02:00
parent 2af3575427
commit f422dbf336
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -26,8 +26,8 @@ public class GuiCraftingMonitor extends GuiBase {
private GuiButton cancelAllButton; private GuiButton cancelAllButton;
private int itemSelected = -1; private int itemSelected = -1;
private int itemSelectedX; private boolean renderItemSelection;
private int itemSelectedY; private int itemSelectedX, itemSelectedY;
private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 89); private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 89);
@@ -42,7 +42,7 @@ public class GuiCraftingMonitor extends GuiBase {
addSideButton(new SideButtonRedstoneMode(craftingMonitor)); addSideButton(new SideButtonRedstoneMode(craftingMonitor));
cancelButton = addButton(x + 7, y + 113, 50, 20, t("misc.refinedstorage:cancel")); cancelButton = addButton(x + 7, y + 113, 50, 20, t("misc.refinedstorage:cancel"));
cancelAllButton = addButton(x + 7 + 50 + 4, y + 113, 60, 20, t("misc.refinedstorage:cancel_all")); cancelAllButton = addButton(x + 7 + 50 + 4, y + 113, 12 + fontRendererObj.getStringWidth(t("misc.refinedstorage:cancel_all")), 20, t("misc.refinedstorage:cancel_all"));
} }
@Override @Override
@@ -64,7 +64,7 @@ public class GuiCraftingMonitor extends GuiBase {
drawTexture(x, y, 0, 0, width, height); drawTexture(x, y, 0, 0, width, height);
if (itemSelected != -1) { if (renderItemSelection) {
drawTexture(x + itemSelectedX, y + itemSelectedY, 178, 0, ITEM_WIDTH, ITEM_HEIGHT); drawTexture(x + itemSelectedX, y + itemSelectedY, 178, 0, ITEM_WIDTH, ITEM_HEIGHT);
} }
@@ -83,9 +83,8 @@ public class GuiCraftingMonitor extends GuiBase {
drawString(7, 7, t("gui.refinedstorage:crafting_monitor")); drawString(7, 7, t("gui.refinedstorage:crafting_monitor"));
drawString(7, 137, t("container.inventory")); drawString(7, 137, t("container.inventory"));
int ox = 11; int x = 8;
int x = ox; int y = 20;
int y = 26;
int item = getOffset() * 2; int item = getOffset() * 2;
@@ -95,21 +94,29 @@ public class GuiCraftingMonitor extends GuiBase {
List<String> infoLines = null; List<String> infoLines = null;
renderItemSelection = false;
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 6; ++i) {
if (item < tasks.size() && item < craftingMonitor.getInfo().length) { if (item < tasks.size() && item < craftingMonitor.getInfo().length) {
if (item == itemSelected) {
renderItemSelection = true;
itemSelectedX = x;
itemSelectedY = y;
}
ItemStack task = tasks.get(item); ItemStack task = tasks.get(item);
drawItem(x, y + 5, task); drawItem(x + 4, y + 11, task);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
float scale = 0.5f; float scale = 0.5f;
GlStateManager.scale(scale, scale, 1); GlStateManager.scale(scale, scale, 1);
drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 3, scale), task.getDisplayName()); drawString(calculateOffsetOnScale(x + 5, scale), calculateOffsetOnScale(y + 4, scale), task.getDisplayName());
GlStateManager.popMatrix(); GlStateManager.popMatrix();
if (inBounds(x, y + 5, 16, 16, mouseX, mouseY)) { if (inBounds(x + 5, y + 10, 16, 16, mouseX, mouseY)) {
infoLines = Arrays.asList(craftingMonitor.getInfo()[item].split("\n")); infoLines = Arrays.asList(craftingMonitor.getInfo()[item].split("\n"));
for (int j = 0; j < infoLines.size(); ++j) { for (int j = 0; j < infoLines.size(); ++j) {
@@ -125,10 +132,10 @@ public class GuiCraftingMonitor extends GuiBase {
} }
if (i == 1 || i == 3) { if (i == 1 || i == 3) {
x = ox; x = 8;
y += 30; y += ITEM_HEIGHT;
} else { } else {
x += 75; x += ITEM_WIDTH;
} }
item++; item++;