diff --git a/src/main/java/refinedstorage/container/ContainerGridFilter.java b/src/main/java/refinedstorage/container/ContainerGridFilter.java index 47fc3be72..c0cd3520a 100755 --- a/src/main/java/refinedstorage/container/ContainerGridFilter.java +++ b/src/main/java/refinedstorage/container/ContainerGridFilter.java @@ -18,7 +18,7 @@ public class ContainerGridFilter extends ContainerBase { addSlotToContainer(new SlotSpecimen(filter, i, 8 + (i * 18), 20)); } - addPlayerInventory(8, 61); + addPlayerInventory(8, 70); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 5fd1d7ebe..229140985 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -7,6 +7,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.config.GuiCheckBox; import org.lwjgl.input.Mouse; import refinedstorage.RefinedStorage; import refinedstorage.gui.sidebutton.SideButton; @@ -150,6 +151,14 @@ public abstract class GuiBase extends GuiContainer { return addButton(x, y, w, h, text, true); } + public GuiCheckBox addCheckBox(int x, int y, String text, boolean checked) { + GuiCheckBox checkBox = new GuiCheckBox(lastButtonId++, x, y, text, checked); + + buttonList.add(checkBox); + + return checkBox; + } + public GuiButton addButton(int x, int y, int w, int h, String text, boolean enabled) { GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); button.enabled = enabled; diff --git a/src/main/java/refinedstorage/gui/GuiGridFilter.java b/src/main/java/refinedstorage/gui/GuiGridFilter.java index 7020e5928..21b03d25d 100755 --- a/src/main/java/refinedstorage/gui/GuiGridFilter.java +++ b/src/main/java/refinedstorage/gui/GuiGridFilter.java @@ -1,14 +1,20 @@ package refinedstorage.gui; +import net.minecraftforge.fml.client.config.GuiCheckBox; import refinedstorage.container.ContainerGridFilter; public class GuiGridFilter extends GuiBase { + private GuiCheckBox compareDamage; + private GuiCheckBox compareNBT; + public GuiGridFilter(ContainerGridFilter container) { - super(container, 176, 148); + super(container, 176, 152); } @Override public void init(int x, int y) { + compareDamage = addCheckBox(x + 7, y + 41, t("gui.refinedstorage:grid_filter.compare_damage"), false); + compareNBT = addCheckBox(x + 7 + compareDamage.getButtonWidth() + 4, y + 41, t("gui.refinedstorage:grid_filter.compare_nbt"), false); } @Override @@ -25,6 +31,6 @@ public class GuiGridFilter extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:grid_filter")); - drawString(7, 55, t("container.inventory")); + drawString(7, 58, t("container.inventory")); } } diff --git a/src/main/resources/assets/refinedstorage/lang/de_DE.lang b/src/main/resources/assets/refinedstorage/lang/de_DE.lang index e406aca4c..c53c918bc 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_DE.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_DE.lang @@ -31,6 +31,8 @@ gui.refinedstorage:crafter.processing=Verarbeitung gui.refinedstorage:processing_pattern_encoder=Schema Anfertigung gui.refinedstorage:processing_pattern_encoder.pattern_create=Kreatives Schema gui.refinedstorage:grid_filter=Zugangspunkt Filter +gui.refinedstorage:grid_filter.compare_damage=Schaden +gui.refinedstorage:grid_filter.compare_nbt=NBT gui.refinedstorage:network_transmitter=Netzwerk Übermittler gui.refinedstorage:network_transmitter.distance=%d Blöcke gui.refinedstorage:network_transmitter.dimension=Dimension %d diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index e35f36752..9e98bb2f4 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -31,6 +31,8 @@ gui.refinedstorage:crafter.processing=Processing gui.refinedstorage:processing_pattern_encoder=Processing Pattern Encoder gui.refinedstorage:processing_pattern_encoder.pattern_create=Create Pattern gui.refinedstorage:grid_filter=Grid Filter +gui.refinedstorage:grid_filter.compare_damage=Damage +gui.refinedstorage:grid_filter.compare_nbt=NBT gui.refinedstorage:network_transmitter=Network Transmitter gui.refinedstorage:network_transmitter.distance=%d blocks gui.refinedstorage:network_transmitter.dimension=Dimension %d diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 5291de209..891c76d5d 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -31,6 +31,8 @@ gui.refinedstorage:crafter.processing=Verwerking gui.refinedstorage:processing_pattern_encoder=Verwerkingspatroon Codeerder gui.refinedstorage:processing_pattern_encoder.pattern_create=Patroon maken gui.refinedstorage:grid_filter=Rooster Filter +gui.refinedstorage:grid_filter.compare_damage=Schade +gui.refinedstorage:grid_filter.compare_nbt=NBT gui.refinedstorage:network_transmitter=Netwerkzender gui.refinedstorage:network_transmitter.distance=%d blokken gui.refinedstorage:network_transmitter.dimension=Dimensie %d diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid_filter.png b/src/main/resources/assets/refinedstorage/textures/gui/grid_filter.png index 25ad95901..94a6a60b5 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/grid_filter.png and b/src/main/resources/assets/refinedstorage/textures/gui/grid_filter.png differ