Small fixes
This commit is contained in:
@@ -33,11 +33,11 @@ public abstract class GuiBase extends GuiContainer {
|
|||||||
private int lastButtonId = 0;
|
private int lastButtonId = 0;
|
||||||
private int lastSideButtonY = 6;
|
private int lastSideButtonY = 6;
|
||||||
|
|
||||||
private Scrollbar scrollbar;
|
|
||||||
|
|
||||||
protected int width;
|
protected int width;
|
||||||
protected int height;
|
protected int height;
|
||||||
|
|
||||||
|
protected Scrollbar scrollbar;
|
||||||
|
|
||||||
public GuiBase(Container container, int width, int height) {
|
public GuiBase(Container container, int width, int height) {
|
||||||
super(container);
|
super(container);
|
||||||
|
|
||||||
@@ -47,14 +47,6 @@ public abstract class GuiBase extends GuiContainer {
|
|||||||
this.ySize = height;
|
this.ySize = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setScrollbar(Scrollbar scrollbar) {
|
|
||||||
this.scrollbar = scrollbar;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Scrollbar getScrollbar() {
|
|
||||||
return scrollbar;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
if (sideButtons.size() > 0) {
|
if (sideButtons.size() > 0) {
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ public class GuiController extends GuiBase {
|
|||||||
public GuiController(ContainerController container, TileController controller) {
|
public GuiController(ContainerController container, TileController controller) {
|
||||||
super(container, 176, 181);
|
super(container, 176, 181);
|
||||||
|
|
||||||
setScrollbar(new Scrollbar(157, 20, 12, 59));
|
|
||||||
|
|
||||||
this.controller = controller;
|
this.controller = controller;
|
||||||
|
|
||||||
|
this.scrollbar = new Scrollbar(157, 20, 12, 59);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -34,8 +34,8 @@ public class GuiController extends GuiBase {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(int x, int y) {
|
public void update(int x, int y) {
|
||||||
getScrollbar().setEnabled(getRows() > VISIBLE_ROWS);
|
scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
|
||||||
getScrollbar().setMaxOffset(getRows() - VISIBLE_ROWS);
|
scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -57,7 +57,7 @@ public class GuiController extends GuiBase {
|
|||||||
int x = 33;
|
int x = 33;
|
||||||
int y = 26;
|
int y = 26;
|
||||||
|
|
||||||
int slot = getScrollbar().getOffset() * 2;
|
int slot = scrollbar.getOffset() * 2;
|
||||||
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,9 @@ public class GuiCraftingMonitor extends GuiBase {
|
|||||||
public GuiCraftingMonitor(ContainerCraftingMonitor container, TileCraftingMonitor craftingMonitor) {
|
public GuiCraftingMonitor(ContainerCraftingMonitor container, TileCraftingMonitor craftingMonitor) {
|
||||||
super(container, 176, 230);
|
super(container, 176, 230);
|
||||||
|
|
||||||
setScrollbar(new Scrollbar(157, 20, 12, 89));
|
|
||||||
|
|
||||||
this.craftingMonitor = craftingMonitor;
|
this.craftingMonitor = craftingMonitor;
|
||||||
|
|
||||||
|
this.scrollbar = new Scrollbar(157, 20, 12, 89);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -55,8 +55,8 @@ public class GuiCraftingMonitor extends GuiBase {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(int x, int y) {
|
public void update(int x, int y) {
|
||||||
getScrollbar().setEnabled(getRows() > VISIBLE_ROWS);
|
scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
|
||||||
getScrollbar().setMaxOffset(getRows() - VISIBLE_ROWS);
|
scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
|
||||||
|
|
||||||
if (itemSelected >= getTasks().size()) {
|
if (itemSelected >= getTasks().size()) {
|
||||||
itemSelected = -1;
|
itemSelected = -1;
|
||||||
@@ -82,7 +82,7 @@ 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 item = getScrollbar().getOffset();
|
int item = scrollbar.getOffset();
|
||||||
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
@@ -173,7 +173,7 @@ public class GuiCraftingMonitor extends GuiBase {
|
|||||||
itemSelected = -1;
|
itemSelected = -1;
|
||||||
|
|
||||||
if (mouseButton == 0 && inBounds(8, 20, 144, 90, mouseX - guiLeft, mouseY - guiTop)) {
|
if (mouseButton == 0 && inBounds(8, 20, 144, 90, mouseX - guiLeft, mouseY - guiTop)) {
|
||||||
int item = getScrollbar().getOffset();
|
int item = scrollbar.getOffset();
|
||||||
|
|
||||||
for (int i = 0; i < VISIBLE_ROWS; ++i) {
|
for (int i = 0; i < VISIBLE_ROWS; ++i) {
|
||||||
int ix = 8;
|
int ix = 8;
|
||||||
|
|||||||
@@ -41,8 +41,10 @@ public class GuiNetworkTransmitter extends GuiBase {
|
|||||||
distance = t("gui.refinedstorage:network_transmitter.missing_upgrade");
|
distance = t("gui.refinedstorage:network_transmitter.missing_upgrade");
|
||||||
} else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) {
|
} else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) {
|
||||||
distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue());
|
distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue());
|
||||||
} else {
|
} else if (TileNetworkTransmitter.DISTANCE.getValue() != -1) {
|
||||||
distance = t("gui.refinedstorage:network_transmitter.distance", TileNetworkTransmitter.DISTANCE.getValue());
|
distance = t("gui.refinedstorage:network_transmitter.distance", TileNetworkTransmitter.DISTANCE.getValue());
|
||||||
|
} else {
|
||||||
|
distance = t("gui.refinedstorage:network_transmitter.missing_card");
|
||||||
}
|
}
|
||||||
|
|
||||||
drawString(51, 24, distance);
|
drawString(51, 24, distance);
|
||||||
|
|||||||
@@ -66,11 +66,11 @@ public class GuiGrid extends GuiBase {
|
|||||||
public GuiGrid(ContainerGrid container, IGrid grid) {
|
public GuiGrid(ContainerGrid container, IGrid grid) {
|
||||||
super(container, grid.getType() == EnumGridType.FLUID ? 193 : 227, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 247 : 208);
|
super(container, grid.getType() == EnumGridType.FLUID ? 193 : 227, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 247 : 208);
|
||||||
|
|
||||||
setScrollbar(new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN || grid.getType() == EnumGridType.FLUID) ? 70 : 88));
|
|
||||||
|
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.grid = grid;
|
this.grid = grid;
|
||||||
this.wasConnected = grid.isConnected();
|
this.wasConnected = grid.isConnected();
|
||||||
|
|
||||||
|
this.scrollbar = new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN || grid.getType() == EnumGridType.FLUID) ? 70 : 88);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -192,8 +192,8 @@ public class GuiGrid extends GuiBase {
|
|||||||
|
|
||||||
STACKS = stacks;
|
STACKS = stacks;
|
||||||
|
|
||||||
getScrollbar().setEnabled(getRows() > getVisibleRows());
|
scrollbar.setEnabled(getRows() > getVisibleRows());
|
||||||
getScrollbar().setMaxOffset(getRows() - getVisibleRows());
|
scrollbar.setMaxOffset(getRows() - getVisibleRows());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -285,7 +285,7 @@ public class GuiGrid extends GuiBase {
|
|||||||
|
|
||||||
this.slotNumber = -1;
|
this.slotNumber = -1;
|
||||||
|
|
||||||
int slot = getScrollbar().getOffset() * 9;
|
int slot = scrollbar.getOffset() * 9;
|
||||||
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user