Merge branch 'master' into scheduled-reason-tooltip

Author: Dream-Master

src/main/java/appeng/client/gui/implementations/GuiBusIO.java

@@ -4,7 +4,6 @@
 import net.minecraft.entity.player.InventoryPlayer;
 
 import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
 
 import appeng.api.config.SchedulingMode;
 import appeng.api.config.Settings;
@@ -95,47 +94,30 @@ public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
         super.drawBG(offsetX, offsetY, mouseX, mouseY);
 
         final int capacity = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY);
-        if (capacity < 1) {
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-            GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F);
-            GL11.glEnable(GL11.GL_BLEND);
-        }
-
-        this.drawTexturedModalRect(offsetX + 61, offsetY + 39, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 79, offsetY + 21, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 97, offsetY + 39, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 79, offsetY + 57, 79, 39, 18, 18);
-
-        if (capacity < 1) {
-            GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-            GL11.glPopAttrib();
-        }
-
-        if (capacity < 2) {
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-            GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F);
-            GL11.glEnable(GL11.GL_BLEND);
-        }
+        final boolean hasOreFilter = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) != 0;
+        final boolean hasFirstTier = capacity > 0;
+        final boolean hasSecondTier = capacity > 1;
 
-        this.drawTexturedModalRect(offsetX + 61, offsetY + 21, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 61, offsetY + 57, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 97, offsetY + 21, 79, 39, 18, 18);
-        this.drawTexturedModalRect(offsetX + 97, offsetY + 57, 79, 39, 18, 18);
-
-        if (capacity < 2) {
-            GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-            GL11.glPopAttrib();
+        for (int y = 0; y < 3; y++) {
+            for (int x = 0; x < 3; x++) {
+                final int slotTextureX = hasOreFilter // true == inactive
+                        || (!hasSecondTier && slotSequence[x + y * 3] > 4)
+                        || (!hasFirstTier && slotSequence[x + y * 3] != 0) ? 79 : 61;
+                this.drawTexturedModalRect(offsetX + 61 + (18 * x), offsetY + 21 + (18 * y), slotTextureX, 21, 18, 18);
+            }
         }
-
     }
 
     @Override
     protected void handleButtonVisibility() {
         super.handleButtonVisibility();
 
         final int capacity = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY);
-        final boolean firstTier = capacity > 0;
-        final boolean secondTier = capacity > 1;
+        final boolean hasOreFilter = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) != 0;
+        final boolean firstTier = capacity > 0 && !hasOreFilter;
+        final boolean secondTier = capacity > 1 && !hasOreFilter;
+
+        this.virtualSlots[0].setHidden(hasOreFilter);
 
         this.virtualSlots[1].setHidden(!firstTier);
         this.virtualSlots[2].setHidden(!firstTier);

src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java

@@ -14,8 +14,6 @@
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
 
 import org.lwjgl.input.Mouse;
 
@@ -24,7 +22,6 @@
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.implementations.tiles.ICellWorkbench;
 import appeng.api.storage.data.IAEStackType;
 import appeng.client.gui.slots.VirtualMEPhantomSlot;
@@ -98,6 +95,12 @@ public void drawBG(final int offsetX, final int offsetY, final int mouseX, final
 
         this.bindTexture(this.getBackground());
         this.drawTexturedModalRect(offsetX, offsetY, 0, 0, 211 - 34, this.ySize);
+
+        final int slotsTextureY = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) != 0 ? 46 : 28;
+
+        for (int i = 0; i < 7; i++)
+            this.drawTexturedModalRect(offsetX + 7, offsetY + 28 + (18 * i), 7, slotsTextureY, 162, 18);
+
         if (this.drawUpgrades()) {
             if (this.workbench.availableUpgrades() <= 8) {
                 this.drawTexturedModalRect(
@@ -193,23 +196,14 @@ private void initVirtualSlots() {
     protected void handleButtonVisibility() {
         this.copyMode.setState(this.workbench.getCopyMode() == CopyMode.CLEAR_ON_REMOVE);
 
-        boolean hasFuzzy = false;
-        boolean hasOreFilter = false;
-        final IInventory inv = this.workbench.getCellUpgradeInventory();
-        for (int x = 0; x < inv.getSizeInventory(); x++) {
-            final ItemStack is = inv.getStackInSlot(x);
-            if (is != null && is.getItem() instanceof IUpgradeModule) {
-                if (((IUpgradeModule) is.getItem()).getType(is) == Upgrades.FUZZY) {
-                    hasFuzzy = true;
-                }
-                if (((IUpgradeModule) is.getItem()).getType(is) == Upgrades.ORE_FILTER) {
-                    hasOreFilter = true;
-                }
-            }
-        }
+        final boolean hasFuzzy = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.FUZZY) != 0;
+        final boolean hasOreFilter = this.cvb.getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) != 0;
+
         this.fuzzyMode.setVisibility(!hasOreFilter && hasFuzzy);
         this.oreFilter.setVisibility(hasOreFilter);
         this.cellRestriction.setVisibility(this.workbench.haveCellRestrictAble());
+
+        for (VirtualMEPhantomSlot configSlot : this.configSlots) configSlot.setHidden(hasOreFilter);
     }
 
     @Override