More small fixes

src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java

@@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.util.IFilter;
 import com.raoulvdberge.refinedstorage.container.ContainerFilter;
 import com.raoulvdberge.refinedstorage.item.FilterItem;
 import com.raoulvdberge.refinedstorage.network.MessageFilterUpdate;
-import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonFilterType;
+import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.FilterTypeSideButton;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.resources.I18n;
@@ -25,8 +25,8 @@ public class FilterScreen extends BaseScreen<ContainerFilter> {
     private String name;
     private int type;
 
-    private GuiCheckBox toggleModFilter;
+    private GuiCheckBox modFilterCheckBox;
-    private Button toggleMode;
+    private Button modeButton;
     private TextFieldWidget nameField;
 
     public FilterScreen(ContainerFilter container, PlayerInventory inventory, ITextComponent title) {
@@ -49,13 +49,13 @@ public class FilterScreen extends BaseScreen<ContainerFilter> {
             sendUpdate();
         });
 
-        toggleModFilter = addCheckBox(0, y + 71 + 25, I18n.format("gui.refinedstorage.filter.mod_filter"), modFilter, btn -> {
+        modFilterCheckBox = addCheckBox(0, y + 71 + 25, I18n.format("gui.refinedstorage.filter.mod_filter"), modFilter, btn -> {
             modFilter = !modFilter;
 
             sendUpdate();
         });
 
-        toggleMode = addButton(x + 7, y + 71 + 21, 0, 20, "", true, true, btn -> {
+        modeButton = addButton(x + 7, y + 71 + 21, 0, 20, "", true, true, btn -> {
             mode = mode == IFilter.MODE_WHITELIST ? IFilter.MODE_BLACKLIST : IFilter.MODE_WHITELIST;
 
             updateModeButton(mode);
@@ -76,15 +76,15 @@ public class FilterScreen extends BaseScreen<ContainerFilter> {
 
         addButton(nameField);
 
-        addSideButton(new SideButtonFilterType(this));
+        addSideButton(new FilterTypeSideButton(this));
     }
 
     private void updateModeButton(int mode) {
         String text = mode == IFilter.MODE_WHITELIST ? I18n.format("sidebutton.refinedstorage.mode.whitelist") : I18n.format("sidebutton.refinedstorage.mode.blacklist");
 
-        toggleMode.setWidth(font.getStringWidth(text) + 12);
+        modeButton.setWidth(font.getStringWidth(text) + 12);
-        toggleMode.setMessage(text);
+        modeButton.setMessage(text);
-        toggleModFilter.x = toggleMode.x + toggleMode.getWidth() + 4;
+        modFilterCheckBox.x = modeButton.x + modeButton.getWidth() + 4;
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java

@@ -5,13 +5,13 @@ import com.raoulvdberge.refinedstorage.tile.config.IType;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.text.TextFormatting;
 
-public class SideButtonFilterType extends SideButton {
+public class FilterTypeSideButton extends SideButton {
     private FilterScreen gui;
 
-    public SideButtonFilterType(FilterScreen gui) {
+    public FilterTypeSideButton(FilterScreen screen) {
-        super(gui);
+        super(screen);
 
-        this.gui = gui;
+        this.gui = screen;
     }
 
     @Override
@@ -20,7 +20,7 @@ public class SideButtonFilterType extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
         gui.blit(x, y, 16 * gui.getType(), 128, 16, 16);
     }
 

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java

@@ -11,13 +11,13 @@ public abstract class SideButton extends Button {
     public static final int WIDTH = 18;
     public static final int HEIGHT = 18;
 
-    protected BaseScreen gui;
+    protected BaseScreen screen;
 
-    public SideButton(BaseScreen gui) {
+    public SideButton(BaseScreen screen) {
         super(-1, -1, 18, 18, "", btn -> {
         });
 
-        this.gui = gui;
+        this.screen = screen;
     }
 
     @Override
@@ -27,21 +27,21 @@ public abstract class SideButton extends Button {
 
         isHovered = RenderUtils.inBounds(x, y, width, height, mouseX, mouseY);
 
-        gui.bindTexture(RS.ID, "icons.png");
+        screen.bindTexture(RS.ID, "icons.png");
-        gui.blit(x, y, 238, isHovered ? 35 : 16, 18, 18);
+        screen.blit(x, y, 238, isHovered ? 35 : 16, 18, 18);
 
-        drawButtonIcon(x + 1, y + 1);
+        renderButtonIcon(x + 1, y + 1);
 
         if (isHovered) {
             GlStateManager.enableBlend();
             GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             GlStateManager.color4f(1.0f, 1.0f, 1.0f, 0.5f);
-            gui.blit(x, y, 238, 54, 18, 18);
+            screen.blit(x, y, 238, 54, 18, 18);
             GlStateManager.disableBlend();
         }
     }
 
-    protected abstract void drawButtonIcon(int x, int y);
+    protected abstract void renderButtonIcon(int x, int y);
 
     public abstract String getTooltip();
 }

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonAccessType.java

@@ -18,8 +18,8 @@ public class SideButtonAccessType extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, 16 * parameter.getValue().getId(), 240, 16, 16);
+        screen.blit(x, y, 16 * parameter.getValue().getId(), 240, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCompare.java

@@ -32,7 +32,7 @@ public class SideButtonCompare extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
         int ty = 0;
 
         if (mask == IComparer.COMPARE_NBT) {
@@ -41,7 +41,7 @@ public class SideButtonCompare extends SideButton {
 
         int tx = (parameter.getValue() & mask) == mask ? 0 : 16;
 
-        gui.blit(x, y, tx, ty, 16, 16);
+        screen.blit(x, y, tx, ty, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonConstuctorDrop.java

@@ -12,8 +12,8 @@ public class SideButtonConstuctorDrop extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, 64 + (TileConstructor.DROP.getValue() ? 16 : 0), 16, 16, 16);
+        screen.blit(x, y, 64 + (TileConstructor.DROP.getValue() ? 16 : 0), 16, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java

@@ -14,19 +14,19 @@ public class SideButtonCrafterManagerSearchBoxMode extends SideButton {
 
     @Override
     public String getTooltip() {
-        return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiCrafterManager) gui).getCrafterManager().getSearchBoxMode());
+        return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiCrafterManager) screen).getCrafterManager().getSearchBoxMode());
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        int mode = ((GuiCrafterManager) gui).getCrafterManager().getSearchBoxMode();
+        int mode = ((GuiCrafterManager) screen).getCrafterManager().getSearchBoxMode();
 
-        gui.blit(x, y, mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16);
+        screen.blit(x, y, mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16);
     }
 
     @Override
     public void onPress() {
-        int mode = ((GuiCrafterManager) gui).getCrafterManager().getSearchBoxMode();
+        int mode = ((GuiCrafterManager) screen).getCrafterManager().getSearchBoxMode();
 
         if (mode == IGrid.SEARCH_BOX_MODE_NORMAL) {
             mode = IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED;

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterMode.java

@@ -17,8 +17,8 @@ public class SideButtonCrafterMode extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, TileCrafter.MODE.getValue() * 16, 0, 16, 16);
+        screen.blit(x, y, TileCrafter.MODE.getValue() * 16, 0, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDestructorPickup.java

@@ -12,8 +12,8 @@ public class SideButtonDestructorPickup extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, 64 + (!TileDestructor.PICKUP.getValue() ? 16 : 0), 0, 16, 16);
+        screen.blit(x, y, 64 + (!TileDestructor.PICKUP.getValue() ? 16 : 0), 0, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDetectorMode.java

@@ -18,8 +18,8 @@ public class SideButtonDetectorMode extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, TileDetector.MODE.getValue() * 16, 176, 16, 16);
+        screen.blit(x, y, TileDetector.MODE.getValue() * 16, 176, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSearchBoxMode.java

@@ -12,19 +12,19 @@ public class SideButtonGridSearchBoxMode extends SideButton {
 
     @Override
     public String getTooltip() {
-        return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiGrid) gui).getGrid().getSearchBoxMode());
+        return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiGrid) screen).getGrid().getSearchBoxMode());
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        int mode = ((GuiGrid) gui).getGrid().getSearchBoxMode();
+        int mode = ((GuiGrid) screen).getGrid().getSearchBoxMode();
 
-        gui.blit(x, y, mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16);
+        screen.blit(x, y, mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16);
     }
 
     @Override
     public void onPress() {
-        int mode = ((GuiGrid) gui).getGrid().getSearchBoxMode();
+        int mode = ((GuiGrid) screen).getGrid().getSearchBoxMode();
 
         if (mode == IGrid.SEARCH_BOX_MODE_NORMAL) {
             mode = IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED;
@@ -40,8 +40,8 @@ public class SideButtonGridSearchBoxMode extends SideButton {
             mode = IGrid.SEARCH_BOX_MODE_NORMAL;
         }
 
-        ((GuiGrid) gui).getGrid().onSearchBoxModeChanged(mode);
+        ((GuiGrid) screen).getGrid().onSearchBoxModeChanged(mode);
 
-        ((GuiGrid) gui).getSearchField().setMode(mode);
+        ((GuiGrid) screen).getSearchField().setMode(mode);
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSize.java

@@ -24,7 +24,7 @@ public class SideButtonGridSize extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
         int size = this.size.get();
 
         int tx = 0;
@@ -39,7 +39,7 @@ public class SideButtonGridSize extends SideButton {
             tx = 32;
         }
 
-        gui.blit(x, y, 64 + tx, 64, 16, 16);
+        screen.blit(x, y, 64 + tx, 64, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingDirection.java

@@ -20,8 +20,8 @@ public class SideButtonGridSortingDirection extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, grid.getSortingDirection() * 16, 16, 16, 16);
+        screen.blit(x, y, grid.getSortingDirection() * 16, 16, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingType.java

@@ -22,11 +22,11 @@ public class SideButtonGridSortingType extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
         if (grid.getSortingType() == IGrid.SORTING_TYPE_LAST_MODIFIED) {
-            gui.blit(x, y, 48, 48, 16, 16);
+            screen.blit(x, y, 48, 48, 16, 16);
         } else {
-            gui.blit(x, y, grid.getSortingType() * 16, 32, 16, 16);
+            screen.blit(x, y, grid.getSortingType() * 16, 32, 16, 16);
         }
     }
 

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridViewType.java

@@ -20,8 +20,8 @@ public class SideButtonGridViewType extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16);
+        screen.blit(x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonIOMode.java

@@ -18,8 +18,8 @@ public class SideButtonIOMode extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16);
+        screen.blit(x, y, TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonMode.java

@@ -22,8 +22,8 @@ public class SideButtonMode extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, parameter.getValue() == IFilterable.WHITELIST ? 0 : 16, 64, 16, 16);
+        screen.blit(x, y, parameter.getValue() == IFilterable.WHITELIST ? 0 : 16, 64, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonRedstoneMode.java

@@ -21,8 +21,8 @@ public class SideButtonRedstoneMode extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, parameter.getValue() * 16, 0, 16, 16);
+        screen.blit(x, y, parameter.getValue() * 16, 0, 16, 16);
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonType.java

@@ -22,8 +22,8 @@ public class SideButtonType extends SideButton {
     }
 
     @Override
-    protected void drawButtonIcon(int x, int y) {
+    protected void renderButtonIcon(int x, int y) {
-        gui.blit(x, y, 16 * type.getValue(), 128, 16, 16);
+        screen.blit(x, y, 16 * type.getValue(), 128, 16, 16);
     }
 
     @Override