Config gui patch

src/configlib/java/fr/alexdoru/configlib/lib/ConfigFieldContainer.java

@@ -158,9 +158,9 @@ private void loadConfigValueToField() throws IllegalAccessException {
                 break;
             }
             case ENUM_COLOR: {
-                EnumChatFormatting value = (EnumChatFormatting) this.getEnumValue(this.getProp().getString());
+                EnumChatFormatting value = this.getEnumValue(this.getProp().getString());
                 if (value == null || !value.isColor()) {
-                    value = (EnumChatFormatting) this.getEnumValue(this.getProp().getDefault());
+                    value = this.getEnumValue(this.getProp().getDefault());
                 }
                 field.set(null, value);
                 break;
@@ -280,7 +280,8 @@ public ConfigUIElement getConfigButton(ConfigGuiScreen configGuiScreen, Renderer
                 }
             }
             case ENUM_COLOR: {
-                return new ColorEnumGuiButton(configGuiScreen, field, event, annotation);
+                final EnumChatFormatting defaultColor = getEnumValue(this.getProp().getDefault());
+                return new ColorEnumGuiButton(configGuiScreen, field, event, annotation, defaultColor);
             }
             case ENUM: {
                 return new EnumGuiButton(field, event, annotation);
@@ -294,13 +295,13 @@ public ConfigProperty getAnnotation() {
     }
 
     @Nullable
-    private Enum<?> getEnumValue(@NotNull String valueName) {
+    private <T extends Enum<T>> T getEnumValue(@NotNull String valueName) {
         if (!Enum.class.isAssignableFrom(field.getType())) {
             throw new IllegalArgumentException();
         }
         try {
-            //noinspection rawtypes,unchecked
-            return Enum.valueOf((Class<? extends Enum>) field.getType(), valueName);
+            //noinspection unchecked
+            return Enum.valueOf((Class<T>) field.getType(), valueName);
         } catch (IllegalArgumentException ignored) {}
         return null;
     }

src/configlib/java/fr/alexdoru/configlib/lib/gui/Scrollbar.java

@@ -35,26 +35,28 @@ public void updateScrollPos(int contentHeight, int boxHeight) {
     }
 
     public void drawScrollbar(ColorPalette colorPalette, Box box, int mouseY, int contentHeight) {
-        final int categoryBoxHeight = box.getHeight() - 2;
-        final boolean renderCategoryScrollbar = contentHeight > categoryBoxHeight;
-        if (renderCategoryScrollbar) {
-            final int scrollBarSize = categoryBoxHeight * categoryBoxHeight / contentHeight;
-            final int minScrollBarY = box.TOP + 1 + 1;
-            final int maxScrollBarY = box.BOTTOM - 1 - scrollBarSize - 1;
-            if (dragging) {
-                final int relativeMouseY = mouseY - minScrollBarY - grabbedAtY;
-                if (maxScrollBarY != minScrollBarY) {
-                    final int newScroll = relativeMouseY * (contentHeight - box.getHeight()) / (maxScrollBarY - minScrollBarY);
-                    this.scroll(this.scroll - newScroll, contentHeight, box.getHeight());
-                }
+        final int REAL_BOX_HEIGHT = box.getHeight();
+        if (contentHeight <= REAL_BOX_HEIGHT) return;
+        final int VERTICAL_MARGIN = 2;
+        final int AVAILABLE_BOX_HEIGHT = REAL_BOX_HEIGHT - VERTICAL_MARGIN * 2;
+        final int thumbHeight = AVAILABLE_BOX_HEIGHT * REAL_BOX_HEIGHT / contentHeight;
+        final int minY = box.TOP + VERTICAL_MARGIN;
+        final int maxY = box.BOTTOM - thumbHeight - VERTICAL_MARGIN;
+        final int scrollRange = contentHeight - REAL_BOX_HEIGHT;
+        final int trackRange = maxY - minY;
+        if (dragging) {
+            final int relativeMouseY = mouseY - minY - grabbedAtY;
+            if (trackRange != 0) {
+                final int newScroll = relativeMouseY * scrollRange / trackRange;
+                this.scroll(this.scroll - newScroll, contentHeight, REAL_BOX_HEIGHT);
             }
-            this.thumb.LEFT = box.RIGHT - 5;
-            this.thumb.TOP = ((maxScrollBarY - minScrollBarY) * this.scroll) / (contentHeight - categoryBoxHeight) + minScrollBarY;
-            this.thumb.RIGHT = this.thumb.LEFT + 3;
-            this.thumb.BOTTOM = this.thumb.TOP + scrollBarSize;
-            GuiUtil.drawVerticalLine(box.RIGHT - 4, box.TOP + 4, box.BOTTOM - 4, colorPalette.SCROLLBAR_TRACK);
-            GuiUtil.drawRect(this.thumb, colorPalette.SCROLLBAR_THUMB);
         }
+        this.thumb.LEFT = box.RIGHT - 5;
+        this.thumb.TOP = minY + (int) ((float)this.scroll / scrollRange * trackRange);
+        this.thumb.RIGHT = this.thumb.LEFT + 3;
+        this.thumb.BOTTOM = this.thumb.TOP + thumbHeight;
+        GuiUtil.drawVerticalLine(box.RIGHT - 4, box.TOP + 4, box.BOTTOM - 4, colorPalette.SCROLLBAR_TRACK);
+        GuiUtil.drawRect(this.thumb, colorPalette.SCROLLBAR_THUMB);
     }
 
     public boolean mouseClicked(int mouseX, int mouseY, MouseButton mouseButton) {
@@ -74,8 +76,8 @@ public void mouseReleased(MouseButton mouseButton) {
 
     private void scroll(int amount, int contentHeight, int boxHeight) {
         this.scroll = this.scroll - amount;
-        if (this.scroll > contentHeight + 2 * ConfigGuiScreen.PADDING - boxHeight) {
-            this.scroll = contentHeight + 2 * ConfigGuiScreen.PADDING - boxHeight;
+        if (this.scroll > contentHeight - boxHeight) {
+            this.scroll = contentHeight - boxHeight;
             this.amountToScroll = 0;
         }
         if (this.scroll <= 0) {

src/configlib/java/fr/alexdoru/configlib/lib/gui/elements/BooleanGuiButton.java

@@ -3,7 +3,6 @@
 import fr.alexdoru.configlib.api.ColorPalette;
 import fr.alexdoru.configlib.api.ConfigProperty;
 import fr.alexdoru.configlib.lib.gui.MouseButton;
-import net.minecraft.util.EnumChatFormatting;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -16,22 +15,24 @@ public class BooleanGuiButton extends ConfigGuiButton {
     public BooleanGuiButton(Field field, Method event, ConfigProperty annotation) throws IllegalAccessException {
         super(field, event, annotation);
         this.toggled = (boolean) this.field.get(null);
-        this.button = new ClickGuiButton(0, 0, 0, mc.fontRendererObj.getStringWidth(" Disabled "), 20, getButtonText());
+        this.button = getMainButton(getBooleanText(toggled));
+        this.rightSideContentWidth = button.width + BUTTON_RIGHT_MARGIN;
+        this.rightSideContentHeight = button.height;
     }
 
     @Override
-    public void draw(ColorPalette colorPalette, int drawX, int drawY, int mouseX, int mouseY) {
-        super.draw(colorPalette, drawX, drawY, mouseX, mouseY);
-        button.xPosition = drawX + boxWidth - button.width - 20;
-        button.yPosition = drawY + (this.hasComment() ? 8 + mc.fontRendererObj.FONT_HEIGHT / 2 : (getHeight() - button.height) / 2);
-        button.drawButton(colorPalette, mc, mouseX, mouseY);
+    public void draw(ColorPalette colorPalette, int drawX, int drawY, int mouseX, int mouseY, boolean canMouseBeVisuallyOverElement) {
+        super.draw(colorPalette, drawX, drawY, mouseX, mouseY, canMouseBeVisuallyOverElement);
+        button.xPosition = contentLeft;
+        button.yPosition = drawY + getCenterYOffset(button.height);
+        button.drawButton(colorPalette, mc, mouseX, mouseY, canMouseBeVisuallyOverElement);
     }
 
     @Override
     public boolean mouseClicked(int mouseX, int mouseY, MouseButton mouseButton) throws IllegalAccessException {
         if (mouseButton.isLeft() && button.mousePressed(mc, mouseX, mouseY)) {
             flipBooleanConfig();
-            button.displayString = getButtonText();
+            button.displayString = getBooleanText(toggled);
             button.playPressSound(mc.getSoundHandler());
             return true;
         }
@@ -43,9 +44,4 @@ private void flipBooleanConfig() throws IllegalAccessException {
         toggled = (boolean) this.field.get(null);
         invokeConfigEvent();
     }
-
-    private String getButtonText() {
-        return toggled ? EnumChatFormatting.GREEN + "Enabled" : EnumChatFormatting.RED + "Disabled";
-    }
-
 }

src/configlib/java/fr/alexdoru/configlib/lib/gui/elements/CategoryGuiButton.java

@@ -41,8 +41,7 @@ public boolean mouseClicked(int mouseX, int mouseY, MouseButton mouseButton) {
     }
 
     private boolean isMouseHovering(int mouseX, int mouseY) {
-        final int extraY = ConfigGuiScreen.ELEMENT_GAP / 2;
-        return mouseX >= posX && mouseY >= posY - extraY && mouseX < posX + getWidth() && mouseY < posY + extraY + getHeight();
+        return mouseX >= posX && mouseY >= posY - getTopMargin() && mouseX < posX + getWidth() && mouseY < posY + getHeight() + getBottomMargin();
     }
 
     public int getWidth() {

src/configlib/java/fr/alexdoru/configlib/lib/gui/elements/CategoryHeader.java

@@ -11,6 +11,8 @@
 
 public class CategoryHeader implements ConfigUIElement {
 
+    private static final int COMMENT_TOP_MARGIN = 4;
+
     private final Minecraft mc = Minecraft.getMinecraft();
     private final String name;
     private final String displayname;
@@ -44,15 +46,15 @@ public void setBoxWidth(int boxWidth) {
     }
 
     @Override
-    public void draw(ColorPalette colorPalette, int drawX, int drawY, int mouseX, int mouseY) {
+    public void draw(ColorPalette colorPalette, int drawX, int drawY, int mouseX, int mouseY, boolean canMouseBeVisuallyOverElement) {
         final int textX = drawX + (boxWidth - mc.fontRendererObj.getStringWidth(displayname) * 2) / 2;
         GlStateManager.translate(textX, drawY, 0);
         GlStateManager.scale(2, 2, 2);
         mc.fontRendererObj.drawStringWithShadow(displayname, 0, 0, colorPalette.CATEGORY_HEADER_TITLE_TEXT);
         GlStateManager.scale(0.5, 0.5, 0.5);
         GlStateManager.translate(-textX, -drawY, 0);
         if (hasComment) {
-            int commentY = drawY + mc.fontRendererObj.FONT_HEIGHT * 2 + 8;
+            int commentY = drawY + mc.fontRendererObj.FONT_HEIGHT * 2 + COMMENT_TOP_MARGIN;
             for (final String line : commentToRender) {
                 final int lineX = drawX + (boxWidth - mc.fontRendererObj.getStringWidth(line)) / 2;
                 mc.fontRendererObj.drawStringWithShadow(line, lineX, commentY, colorPalette.CATEGORY_HEADER_COMMENT_TEXT);
@@ -69,9 +71,9 @@ public boolean mouseClicked(int mouseX, int mouseY, MouseButton mouseButton) {
     @Override
     public int getHeight() {
         if (hasComment) {
-            return mc.fontRendererObj.FONT_HEIGHT * 2 + 8 + mc.fontRendererObj.FONT_HEIGHT * commentToRender.size() + 8;
+            return mc.fontRendererObj.FONT_HEIGHT * 2 + COMMENT_TOP_MARGIN + mc.fontRendererObj.FONT_HEIGHT * commentToRender.size();
         }
-        return mc.fontRendererObj.FONT_HEIGHT * 2 + 8;
+        return mc.fontRendererObj.FONT_HEIGHT * 2;
     }
 
     @Override
@@ -89,4 +91,8 @@ public boolean matchSearch(String search) {
         return false;
     }
 
+    @Override
+    public int getBottomMargin() {
+        return 8;
+    }
 }

src/configlib/java/fr/alexdoru/configlib/lib/gui/elements/ClickGuiButton.java

@@ -35,7 +35,11 @@ public void setTexture(ResourceLocation texture) {
     }
 
     public void drawButton(ColorPalette colorPalette, Minecraft mc, int mouseX, int mouseY) {
-        this.hovered = this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
+        drawButton(colorPalette, mc, mouseX, mouseY, true);
+    }
+
+    public void drawButton(ColorPalette colorPalette, Minecraft mc, int mouseX, int mouseY, boolean canMouseBeVisuallyOverElement) {
+        this.hovered = canMouseBeVisuallyOverElement && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
         if (this.visible) {
             this.mouseDragged(mc, mouseX, mouseY);
             GuiUtil.drawBoxWithOutline(