Merge pull request #129 from hypherionmc/1.12

New Cycle Button Popups and Color Accessibility Changes

src/main/java/com/enderio/core/client/gui/button/CycleButton.java

@@ -1,16 +1,27 @@
 package com.enderio.core.client.gui.button;
 
+import java.awt.*;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.enderio.core.api.client.gui.IGuiOverlay;
 import com.enderio.core.api.client.gui.IGuiScreen;
 import com.enderio.core.api.client.render.IWidgetIcon;
+import com.enderio.core.client.gui.GuiContainerBase;
 import com.enderio.core.client.gui.button.CycleButton.ICycleEnum;
+import com.enderio.core.client.render.ColorUtil;
+import com.enderio.core.client.render.EnderWidget;
+import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.NNList;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import org.apache.commons.lang3.tuple.Pair;
+import org.lwjgl.input.Mouse;
 
 /**
  * A button which automatically parses enum constants and cycles between them when clicked.
@@ -39,53 +50,172 @@ public interface ICycleEnum {
 
   private @Nullable T mode;
 
+  private boolean isOpened = true;
+  private PickerOverlay overlay;
+
   public CycleButton(@Nonnull IGuiScreen gui, int id, int x, int y, @Nonnull Class<T> enumClass) {
-    super(gui, id, x, y, null);
-    modes = NNList.of(enumClass);
+    super(gui, id, x, y, (IWidgetIcon)null);
+    this.modes = NNList.of(enumClass);
+    overlay = new PickerOverlay(this);
+    ((GuiContainerBase)gui).addOverlay(overlay);
   }
 
   @Override
   public void onGuiInit() {
     super.onGuiInit();
-    if (mode == null) {
-      setMode(modes.get(0));
+    if (this.mode == null) {
+      this.setMode((T) this.modes.get(0));
+      this.setIcon(this.getMode().getIcon());
     }
   }
 
   @Override
   public boolean mousePressedButton(@Nonnull Minecraft mc, int mouseX, int mouseY, int button) {
-    if (super.checkMousePress(mc, mouseX, mouseY)) {
-      if (button == 0) {
-        nextMode();
-        return true;
-      } else if (button == 1) {
-        prevMode();
-        return true;
-      }
+    boolean result = super.mousePressedButton(mc, mouseX, mouseY, button);
+    if (result) {
+      overlay.setIsVisible(!overlay.isVisible());
     }
-    return false;
+    return result;
   }
 
-  private void nextMode() {
-    setMode(modes.next(getMode()));
+  public void setMode(@Nonnull T newMode) {
+    if (this.mode != newMode) {
+      this.mode = newMode;
+      List<String> tooltip = newMode.getTooltipLines();
+      this.setToolTip(tooltip.toArray(new String[tooltip.size()]));
+      this.icon = newMode.getIcon();
+    }
   }
 
-  private void prevMode() {
-    setMode(modes.prev(getMode()));
+  public @Nonnull T getMode() {
+    return this.mode != null ? this.mode : (T) this.modes.get(0);
   }
 
-  public void setMode(@Nonnull T newMode) {
-    if (mode == newMode) {
-      return;
+  class PickerOverlay implements IGuiOverlay {
+
+    CycleButton cycleButton;
+    Rectangle bounds = new Rectangle(0, 0, 0, 0);
+    List<Pair<Rectangle, T>> modes  = new ArrayList<>();
+
+    boolean visible;
+    int rows = 0;
+    int cols = 0;
+
+    int yOffset = 0;
+    int xOffset = 0;
+    int width = 0;
+    int height = 0;
+
+    public PickerOverlay(CycleButton cycleButton) {
+      this.cycleButton = cycleButton;
+
+      int clrIndex = 0;
+
+      while (rows * cols < cycleButton.modes.size()) {
+        if ((cols + 1) * rows >= cycleButton.modes.size()) {
+          cols++;
+        } else if ((rows + 1) * cols >= cycleButton.modes.size()) {
+          rows++;
+        } else if (cols > rows) {
+          rows++;
+        } else {
+          cols++;
+        }
+      }
+
+      yOffset = cycleButton.yOrigin + cycleButton.height;
+      xOffset = cycleButton.xOrigin;
+      width = 17 * cols + 4;
+      height = 17 * rows + 4;
+      setBounds(new Rectangle(xOffset, yOffset, width, height));
+
+      for (int r = 0; r < rows; r++) {
+        for (int c = 0; c < cols; c++) {
+          if (clrIndex < cycleButton.modes.size()) {
+            modes.add(Pair.of(new Rectangle(17 * c, 3 + 17 * r, 17, 17), (T)cycleButton.modes.get(clrIndex)));
+            clrIndex++;
+          }
+        }
+      }
     }
-    mode = newMode;
-    List<String> tooltip = newMode.getTooltipLines();
-    setToolTip(tooltip.toArray(new String[tooltip.size()]));
 
-    icon = newMode.getIcon();
-  }
+    @Override
+    public void init(@Nonnull IGuiScreen screen) {
+    }
+
+    @Override
+    public @Nonnull Rectangle getBounds() {
+      return bounds;
+    }
+
+    public void setBounds(Rectangle bounds) {
+      this.bounds = bounds;
+    }
+
+    @Override
+    public void draw(int mouseX, int mouseY, float partialTick) {
+      RenderHelper.enableGUIStandardItemLighting();
+      GlStateManager.enableDepth();
+
+      if (isOpened) {
+        for (Pair<Rectangle, T> pair : modes) {
+          IWidgetIcon icon = pair.getRight().getIcon();
+
+          if (cycleButton.getMode() == pair.getRight()) {
+            setBounds(new Rectangle((cycleButton.xOrigin - (pair.getLeft().x)), cycleButton.yOrigin - pair.getLeft().y, width, height));
+            EnderWidget.BUTTON_DOWN_HIGHLIGHT.getMap().render(EnderWidget.BUTTON_DOWN_HIGHLIGHT, getBounds().x + pair.getLeft().x, getBounds().y + pair.getLeft().y, 390, true);
+          } else {
+            EnderWidget.BUTTON.getMap().render(EnderWidget.BUTTON, getBounds().x + pair.getLeft().x, getBounds().y + pair.getLeft().y, 390, true);
+          }
+          icon.getMap().render(icon, getBounds().x + pair.getLeft().x, getBounds().y + pair.getLeft().y, 400, true);
+        }
+
+        RenderUtil.renderQuad2D(getBounds().x - 2, getBounds().y + 1, 300, width - 1, height - 1, ColorUtil.getRGB(Color.DARK_GRAY));
+        RenderUtil.renderQuad2D(getBounds().x - 1, getBounds().y + 2, 300, width - 3, height - 3, ColorUtil.getRGB(Color.GRAY));
+      }
+    }
+
+    @Override
+    public void setIsVisible(boolean visible) {
+      this.visible = visible;
+    }
+
+    @Override
+    public boolean isVisible() {
+      return visible;
+    }
+
+    @Override
+    public boolean handleMouseInput(int x, int y, int b) {
+      if (isMouseInBounds(x, y)) {
+        if (b == 0 && Mouse.isButtonDown(b)) {
+          int mouseX = x - cycleButton.gui.getGuiRootLeft() - getBounds().x;
+          int mouseY = y - cycleButton.gui.getGuiRootTop() - getBounds().y;
+          for (Pair<Rectangle, T> pair : modes) {
+            if (pair.getLeft().contains(mouseX, mouseY)) {
+              cycleButton.setMode(pair.getRight());
+              setIsVisible(false);
+            }
+          }
+        }
+        return true;
+      }
+      if (b == 0 && Mouse.isButtonDown(b)) {
+        setIsVisible(false);
+      }
+      return false;
+    }
+
+    @Override
+    public boolean isMouseInBounds(int mouseX, int mouseY) {
+      int x = mouseX - cycleButton.gui.getGuiRootLeft();
+      int y = mouseY - cycleButton.gui.getGuiRootTop();
+      return bounds.contains(x, y);
+    }
+
+    @Override
+    public void guiClosed() {
+    }
 
-  public @Nonnull T getMode() {
-    return mode != null ? mode : modes.get(0);
   }
 }