Further tweak security manager GUI

This commit is contained in:
Raoul Van den Berge
2016-12-16 23:07:51 +01:00
parent 3691a7d158
commit 31d8f25cc4
5 changed files with 39 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ public class ContainerSecurityManager extends ContainerBase {
addSlotToContainer(new SlotItemHandler(tile.getEditCard(), 0, 80, 70)); addSlotToContainer(new SlotItemHandler(tile.getEditCard(), 0, 80, 70));
addPlayerInventory(8, 127); addPlayerInventory(8, 152);
} }
@Override @Override

View File

@@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.client.config.GuiCheckBox; import net.minecraftforge.fml.client.config.GuiCheckBox;
import net.minecraftforge.fml.client.config.GuiUtils;
import net.minecraftforge.items.SlotItemHandler; import net.minecraftforge.items.SlotItemHandler;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
@@ -298,7 +299,7 @@ public abstract class GuiBase extends GuiContainer {
public void drawTooltip(int x, int y, List<String> lines) { public void drawTooltip(int x, int y, List<String> lines) {
GlStateManager.disableLighting(); GlStateManager.disableLighting();
drawHoveringText(lines, x, y); GuiUtils.drawHoveringText(null, lines, x, y, width - guiLeft, height, -1, fontRendererObj);
GlStateManager.enableLighting(); GlStateManager.enableLighting();
} }

View File

@@ -1,14 +1,30 @@
package com.raoulvdberge.refinedstorage.gui; package com.raoulvdberge.refinedstorage.gui;
import com.raoulvdberge.refinedstorage.api.network.Permission;
import com.raoulvdberge.refinedstorage.container.ContainerSecurityManager; import com.raoulvdberge.refinedstorage.container.ContainerSecurityManager;
import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.TileSecurityManager;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fml.client.config.GuiCheckBox;
public class GuiSecurityManager extends GuiBase { public class GuiSecurityManager extends GuiBase {
private GuiCheckBox[] permissions = new GuiCheckBox[Permission.values().length];
public GuiSecurityManager(ContainerSecurityManager container) { public GuiSecurityManager(ContainerSecurityManager container) {
super(container, 176, 209); super(container, 176, 234);
} }
@Override @Override
public void init(int x, int y) { public void init(int x, int y) {
addSideButton(new SideButtonRedstoneMode(this, TileSecurityManager.REDSTONE_MODE));
int padding = 15;
permissions[0] = addCheckBox(x + 7, y + 93, I18n.format("gui.refinedstorage:security_manager.permission.0"), false);
permissions[1] = addCheckBox(permissions[0].xPosition, permissions[0].yPosition + padding, I18n.format("gui.refinedstorage:security_manager.permission.1"), false);
permissions[2] = addCheckBox(permissions[1].xPosition, permissions[1].yPosition + padding, I18n.format("gui.refinedstorage:security_manager.permission.2"), false);
permissions[3] = addCheckBox(permissions[0].xPosition + 80, permissions[0].yPosition, I18n.format("gui.refinedstorage:security_manager.permission.3"), false);
permissions[4] = addCheckBox(permissions[3].xPosition, permissions[3].yPosition + padding, I18n.format("gui.refinedstorage:security_manager.permission.4"), false);
} }
@Override @Override
@@ -26,6 +42,14 @@ public class GuiSecurityManager extends GuiBase {
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t("gui.refinedstorage:security_manager")); drawString(7, 7, t("gui.refinedstorage:security_manager"));
drawString(7, 59, t("gui.refinedstorage:security_manager.configure")); drawString(7, 59, t("gui.refinedstorage:security_manager.configure"));
drawString(7, 115, t("container.inventory")); drawString(7, 140, t("container.inventory"));
for (int i = 0; i < permissions.length; ++i) {
GuiCheckBox permission = permissions[i];
if (inBounds(permission.xPosition - guiLeft, permission.yPosition - guiTop, permission.width, permission.height, mouseX, mouseY)) {
drawTooltip(mouseX, mouseY, I18n.format("gui.refinedstorage:security_manager.permission." + i + ".tooltip"));
}
}
} }
} }

View File

@@ -58,6 +58,16 @@ gui.refinedstorage:reader=Reader
gui.refinedstorage:writer=Writer gui.refinedstorage:writer=Writer
gui.refinedstorage:security_manager=Security Manager gui.refinedstorage:security_manager=Security Manager
gui.refinedstorage:security_manager.configure=Configure gui.refinedstorage:security_manager.configure=Configure
gui.refinedstorage:security_manager.permission.0=Insert
gui.refinedstorage:security_manager.permission.0.tooltip=Inserting items to the network
gui.refinedstorage:security_manager.permission.1=Extract
gui.refinedstorage:security_manager.permission.1.tooltip=Extracting items from the network
gui.refinedstorage:security_manager.permission.2=Autocraft
gui.refinedstorage:security_manager.permission.2.tooltip=Starting and cancelling crafting tasks
gui.refinedstorage:security_manager.permission.3=Modify
gui.refinedstorage:security_manager.permission.3.tooltip=Opening GUIs, adding or removing blocks from the network
gui.refinedstorage:security_manager.permission.4=Security
gui.refinedstorage:security_manager.permission.4.tooltip=Ability to change security options
misc.refinedstorage:energy_stored=%d / %d RS misc.refinedstorage:energy_stored=%d / %d RS
misc.refinedstorage:energy_usage=Usage: %d RS/t misc.refinedstorage:energy_usage=Usage: %d RS/t

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB