added zooming when scrolling with control held down, implements #1

Author: way2muchnoise

Common/src/main/java/betteradvancements/common/gui/BetterAdvancementTab.java

@@ -72,7 +72,7 @@ public void drawIcon(GuiGraphics guiGraphics, int left, int top,int width, int h
         this.type.drawIcon(guiGraphics, left, top, width, height, this.index, this.icon);
     }
 
-    public void drawContents(GuiGraphics guiGraphics, int left, int top, int width, int height) {
+    public void drawContents(GuiGraphics guiGraphics, int left, int top, int width, int height, float zoom) {
         if (!this.centered) {
             this.scrollX = (width - (this.maxX + this.minX)) / 2;
             this.scrollY = (height - (this.maxY + this.minY)) / 2;
@@ -96,25 +96,25 @@ public void drawContents(GuiGraphics guiGraphics, int left, int top, int width,
             guiGraphics.blit(RenderType::guiTextured, resourcelocation, i + 16 * k, j + 16 * l, 0.0F, 0.0F, 16, height % 16, 16, 16);
         }
 
-
+        guiGraphics.pose().scale(zoom, zoom, 1F);
         this.root.drawConnectivity(guiGraphics, this.scrollX, this.scrollY, true);
         this.root.drawConnectivity(guiGraphics, this.scrollX, this.scrollY, false);
         this.root.draw(guiGraphics, this.scrollX, this.scrollY);
         guiGraphics.pose().popPose();
         guiGraphics.disableScissor();
     }
 
-    public void drawToolTips(GuiGraphics guiGraphics, int mouseX, int mouseY, int left, int top, int width, int height) {
+    public void drawToolTips(GuiGraphics guiGraphics, int mouseX, int mouseY, int left, int top, int width, int height, float zoom) {
         guiGraphics.pose().pushPose();
         guiGraphics.pose().translate(0.0D, 0.0D, -200.0D);
         guiGraphics.fill(0, 0, width, height, Mth.floor(this.fade * 255.0F) << 24);
         boolean flag = false;
 
         if (mouseX > 0 && mouseX < width && mouseY > 0 && mouseY < height) {
             for (BetterAdvancementWidget betterAdvancementWidget : this.widgets.values()) {
-                if (betterAdvancementWidget.isMouseOver(this.scrollX, this.scrollY, mouseX, mouseY)) {
+                if (betterAdvancementWidget.isMouseOver(this.scrollX, this.scrollY, mouseX, mouseY, zoom)) {
                     flag = true;
-                    betterAdvancementWidget.drawHover(guiGraphics, this.scrollX, this.scrollY, this.fade, left, top);
+                    betterAdvancementWidget.drawHover(guiGraphics, this.scrollX, this.scrollY, this.fade, left, top, zoom);
                     break;
                 }
             }

Common/src/main/java/betteradvancements/common/gui/BetterAdvancementWidget.java

@@ -247,23 +247,25 @@ public void addGuiAdvancement(BetterAdvancementWidget betterAdvancementEntryScre
         this.children.add(betterAdvancementEntryScreen);
     }
 
-    public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float fade, int left, int top) {
+    public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float fade, int left, int top, float zoom) {
         this.refreshHover();
-        boolean drawLeft = left + scrollX + this.x + this.width + ADVANCEMENT_SIZE >= this.betterAdvancementTabGui.getScreen().internalWidth;
+        float scaled_scrolled_x = (scrollX + this.x) * zoom;
+        float scaled_scrolled_y = (scrollY + this.y) * zoom;
+        boolean drawLeft = left + scaled_scrolled_x  + this.width + ADVANCEMENT_SIZE >= this.betterAdvancementTabGui.getScreen().internalWidth;
         String s = this.advancementProgress == null || this.advancementProgress.getProgressText() == null ? null : this.advancementProgress.getProgressText().getString();
         int i = s == null ? 0 : this.minecraft.font.width(s);
         boolean drawTop;
 
         if (!CriterionGrid.requiresShift || Screen.hasShiftDown()) {
             if (this.criterionGrid.height < this.betterAdvancementTabGui.getScreen().height) {
-                drawTop = top + scrollY + this.y + this.description.size() * this.minecraft.font.lineHeight + this.criterionGrid.height + 50 >= this.betterAdvancementTabGui.getScreen().height;
+                drawTop = top + scaled_scrolled_y + this.description.size() * this.minecraft.font.lineHeight + this.criterionGrid.height + 50 >= this.betterAdvancementTabGui.getScreen().height;
             } else {
                 // Always draw on the bottom if the grid is larger than the screen
                 drawTop = false;
             }
         }
         else {
-            drawTop = top + scrollY + this.y + this.description.size() * this.minecraft.font.lineHeight + 50 >= this.betterAdvancementTabGui.getScreen().height;
+            drawTop = top + scaled_scrolled_y + this.description.size() * this.minecraft.font.lineHeight + 50 >= this.betterAdvancementTabGui.getScreen().height;
         }
 
         float percentageObtained = this.advancementProgress == null ? 0.0F : this.advancementProgress.getPercent();
@@ -295,13 +297,15 @@ public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float f
 
         int k = this.width - j;
         RenderSystem.enableBlend();
-        int drawY = scrollY + this.y;
+        int rounded_scaled_scrolled_x = Math.round(scaled_scrolled_x);
+        int rounded_scaled_scrolled_y = Math.round(scaled_scrolled_y);
+        int drawY = rounded_scaled_scrolled_y;
         int drawX;
 
         if (drawLeft) {
-            drawX = scrollX + this.x - this.width + ADVANCEMENT_SIZE + 6;
+            drawX = rounded_scaled_scrolled_x - this.width + ADVANCEMENT_SIZE + 6;
         } else {
-            drawX = scrollX + this.x;
+            drawX = rounded_scaled_scrolled_x;
         }
         int boxHeight;
 
@@ -337,28 +341,28 @@ public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float f
         }
         // Advancement icon
         RenderUtil.setColor(betterDisplayInfo.getIconColor(stateIcon));
-        guiGraphics.blitSprite(RenderType::guiTextured, stateIcon.frameSprite(this.displayInfo.getType()), scrollX + this.x + 3, scrollY + this.y, ICON_SIZE, ICON_SIZE);
+        guiGraphics.blitSprite(RenderType::guiTextured, stateIcon.frameSprite(this.displayInfo.getType()), rounded_scaled_scrolled_x + 3, rounded_scaled_scrolled_y, ICON_SIZE, ICON_SIZE);
         RenderUtil.setColor(betterDisplayInfo.defaultIconColor());
 
         if (drawLeft) {
-            guiGraphics.drawString(this.minecraft.font, this.title, drawX + 5, scrollY + this.y + 9, -1);
+            guiGraphics.drawString(this.minecraft.font, this.title, drawX + 5, rounded_scaled_scrolled_y + 9, -1);
 
             if (s != null) {
-                guiGraphics.drawString(this.minecraft.font, s, scrollX + this.x - i, scrollY + this.y + 9, -1);
+                guiGraphics.drawString(this.minecraft.font, s, rounded_scaled_scrolled_x - i, rounded_scaled_scrolled_y + 9, -1);
             }
         } else {
-            guiGraphics.drawString(this.minecraft.font, this.title, scrollX + this.x + 32, scrollY + this.y + 9, -1);
+            guiGraphics.drawString(this.minecraft.font, this.title, rounded_scaled_scrolled_x + 32, rounded_scaled_scrolled_y + 9, -1);
 
             if (s != null) {
-                guiGraphics.drawString(this.minecraft.font, s, scrollX + this.x + this.width - i - 5, scrollY + this.y + 9, -1);
+                guiGraphics.drawString(this.minecraft.font, s, rounded_scaled_scrolled_x + this.width - i - 5, rounded_scaled_scrolled_y + 9, -1);
             }
         }
 
         int yOffset;
         if (drawTop) {
             yOffset = drawY + 26 - boxHeight + 7;
         } else {
-            yOffset = scrollY + this.y + 9 + 17;
+            yOffset = rounded_scaled_scrolled_y + 9 + 17;
         }
         for (int k1 = 0; k1 < this.description.size(); ++k1) {
             guiGraphics.drawString(this.minecraft.font, this.description.get(k1), drawX + 5, yOffset + k1 * this.minecraft.font.lineHeight, -5592406, false);
@@ -375,7 +379,7 @@ public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float f
             }
         }
 
-        guiGraphics.renderFakeItem(this.displayInfo.getIcon(), scrollX + this.x + 8, scrollY + this.y + 5);
+        guiGraphics.renderFakeItem(this.displayInfo.getIcon(), rounded_scaled_scrolled_x + 8, rounded_scaled_scrolled_y + 5);
     }
 
     protected void render9Sprite(GuiGraphics guiGraphics, int x, int y, int width, int height, int textureHeight, int textureWidth, int textureDistance, int textureX, int textureY) {
@@ -399,13 +403,13 @@ protected void render9Sprite(GuiGraphics guiGraphics, int x, int y, int width, i
         RenderUtil.renderRepeating(Resources.Gui.WIDGETS, guiGraphics, x + width - textureHeight, y + textureHeight, textureHeight, height - textureHeight - textureHeight, textureX + textureWidth - textureHeight, textureY + textureHeight, textureWidth, textureDistance - textureHeight - textureHeight);
     }
 
-    public boolean isMouseOver(double scrollX, double scrollY, double mouseX, double mouseY) {
+    public boolean isMouseOver(double scrollX, double scrollY, double mouseX, double mouseY, float zoom) {
         if (!this.displayInfo.isHidden() || this.advancementProgress != null && this.advancementProgress.isDone()) {
             double left = scrollX + this.x;
             double right = left + ADVANCEMENT_SIZE;
             double top = scrollY + this.y;
             double bottom = top + ADVANCEMENT_SIZE;
-            return mouseX >= left && mouseX <= right && mouseY >= top && mouseY <= bottom;
+            return mouseX >= left * zoom && mouseX <= right * zoom && mouseY >= top * zoom && mouseY <= bottom * zoom;
         } else {
             return false;
         }

Common/src/main/java/betteradvancements/common/gui/BetterAdvancementsScreen.java

@@ -27,12 +27,12 @@ public class BetterAdvancementsScreen extends Screen implements ClientAdvancemen
     private static final Component TITLE =Component.translatable("gui.advancements");
     private static final int WIDTH = 252, HEIGHT = 140, CORNER_SIZE = 30;
     private static final int SIDE = 30, TOP = 40, BOTTOM = 30, PADDING = 9;
-    private static final float MIN_ZOOM = 1, MAX_ZOOM = 2, ZOOM_STEP = 0.2F;
+    public static final float MIN_ZOOM = 0.4F, MAX_ZOOM = 1.6F, ZOOM_STEP = 0.1F;
     private final ClientAdvancements clientAdvancements;
     private final Map<AdvancementHolder, BetterAdvancementTab> tabs = Maps.newLinkedHashMap();
     private BetterAdvancementTab selectedTab;
     private static int tabPage, maxPages;
-    private float zoom = MIN_ZOOM;
+    public static float zoom = 1.0F;
     private boolean isScrolling;
     protected int internalWidth, internalHeight;
     public static int uiScaling = 100;
@@ -126,7 +126,12 @@ public boolean mouseClicked(double mouseX, double mouseY, int modifiers) {
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
         if (this.selectedTab != null) {
-            this.selectedTab.scroll(scrollX * 16.0, scrollY * 16.0, width, height);
+            if (Screen.hasControlDown()) {
+                zoom += scrollY > 0 ? ZOOM_STEP : -ZOOM_STEP;
+                zoom = Math.max(MIN_ZOOM, Math.min(zoom, MAX_ZOOM));
+            } else {
+                this.selectedTab.scroll(scrollX * 16.0, scrollY * 16.0, width, height);
+            }
             return true;
         } else {
             return false;
@@ -159,7 +164,7 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double mou
                 boolean inGui = mouseX < left + internalWidth - 2*SIDE - PADDING && mouseX > left + PADDING && mouseY < top + internalHeight - TOP + 1 && mouseY > top + 2*PADDING;
                 if (this.selectedTab != null && inGui) {
                     for (BetterAdvancementWidget betterAdvancementEntryScreen : this.selectedTab.widgets.values()) {
-                        if (betterAdvancementEntryScreen.isMouseOver(this.selectedTab.scrollX, this.selectedTab.scrollY, mouseX - left - PADDING, mouseY - top - 2*PADDING)) {
+                        if (betterAdvancementEntryScreen.isMouseOver(this.selectedTab.scrollX, this.selectedTab.scrollY, mouseX - left - PADDING, mouseY - top - 2*PADDING, zoom)) {
 
                             if (betterAdvancementEntryScreen.betterDisplayInfo.allowDragging())
                             {
@@ -383,7 +388,7 @@ private void renderInside(GuiGraphics guiGraphics, int mouseX, int mouseY, int l
             guiGraphics.drawString(this.font, NO_ADVANCEMENTS_LABEL, boxLeft + (width - this.font.width(NO_ADVANCEMENTS_LABEL)) / 2, boxTop + height / 2 - this.font.lineHeight, -1);
             guiGraphics.drawString(this.font, VERY_SAD_LABEL, boxLeft + (width - this.font.width(VERY_SAD_LABEL)) / 2, boxTop + height / 2 + this.font.lineHeight, -1);
         } else {
-            betterAdvancementTab.drawContents(guiGraphics, boxLeft, boxTop, width, height);
+            betterAdvancementTab.drawContents(guiGraphics, boxLeft, boxTop, width, height, zoom);
         }
     }
 
@@ -441,7 +446,7 @@ private void renderToolTips(GuiGraphics guiGraphics, int mouseX, int mouseY, int
             guiGraphics.pose().pushPose();
             guiGraphics.pose().translate(left + PADDING, top + 2*PADDING, 400.0D);
             RenderSystem.enableDepthTest();
-            this.selectedTab.drawToolTips(guiGraphics,mouseX - left - PADDING, mouseY - top - 2*PADDING, left, top, right - left - 2*PADDING, bottom - top - 3*PADDING);
+            this.selectedTab.drawToolTips(guiGraphics,mouseX - left - PADDING, mouseY - top - 2*PADDING, left, top, right - left - 2*PADDING, bottom - top - 3*PADDING, zoom);
             RenderSystem.disableDepthTest();
             guiGraphics.pose().popPose();
         }

Fabric/src/main/java/betteradvancements/fabric/config/ConfigFileHandler.java

@@ -57,6 +57,9 @@ public static void readFromConfig() {
         if (root.has("uiScaling")) {
             BetterAdvancementsScreen.uiScaling = root.get("uiScaling").getAsInt();
         }
+        if (root.has("defaultZoom")) {
+            BetterAdvancementsScreen.zoom = root.get("defaultZoom").getAsFloat();
+        }
         if (root.has("criteriaDetail")) {
             CriterionGrid.detailLevel = CriteriaDetail.fromName(root.get("criteriaDetail").getAsString());
         }
@@ -94,6 +97,7 @@ public static void writeToConfig() {
         root.addProperty("showDebugCoordinates", BetterAdvancementsScreen.showDebugCoordinates);
         root.addProperty("orderTabsAlphabetically", BetterAdvancementsScreen.orderTabsAlphabetically);
         root.addProperty("uiScaling", BetterAdvancementsScreen.uiScaling);
+        root.addProperty("defaultZoom", BetterAdvancementsScreen.zoom);
         root.addProperty("criteriaDetail", CriterionGrid.detailLevel.getName());
         root.addProperty("criteriaDetailRequiresShift", CriterionGrid.requiresShift);
         root.addProperty("addInventoryButton", BetterAdvancementsScreenButton.addToInventory);

Fabric/src/main/java/betteradvancements/fabric/config/ConfigValues.java

@@ -10,10 +10,7 @@
 import betteradvancements.common.util.CriterionGrid;
 import me.shedaniel.clothconfig2.api.ConfigCategory;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.gui.entries.BooleanListEntry;
-import me.shedaniel.clothconfig2.gui.entries.ColorEntry;
-import me.shedaniel.clothconfig2.gui.entries.DropdownBoxEntry;
-import me.shedaniel.clothconfig2.gui.entries.IntegerSliderEntry;
+import me.shedaniel.clothconfig2.gui.entries.*;
 import net.minecraft.network.chat.Component;
 
 public class ConfigValues {
@@ -27,6 +24,7 @@ public class ConfigValues {
     public static BooleanListEntry showDebugCoordinates;
     public static BooleanListEntry orderTabsAlphabetically;
     public static IntegerSliderEntry uiScaling;
+    public static FloatListEntry defaultZoom;
 
     public static DropdownBoxEntry<CriteriaDetail> detailLevel;
     public static BooleanListEntry requiresShift;
@@ -82,6 +80,14 @@ public static void build(ConfigCategory category, ConfigEntryBuilder builder) {
             .setSaveConsumer(newValue -> BetterAdvancementsScreen.uiScaling = newValue)
             .build();
         category.addEntry(uiScaling);
+        defaultZoom = builder.startFloatField(Component.literal("defaultZoom"), BetterAdvancementsScreen.zoom)
+                .setTooltip(Component.literal("UI zoom steps are 0.1"))
+                .setDefaultValue(1F)
+                .setMin(BetterAdvancementsScreen.MIN_ZOOM)
+                .setMax(BetterAdvancementsScreen.MAX_ZOOM)
+                .setSaveConsumer(newValue -> BetterAdvancementsScreen.zoom = newValue)
+                .build();
+        category.addEntry(defaultZoom);
 
         detailLevel = builder.startDropdownMenu(Component.literal("criteriaDetail"),
                 CriterionGrid.detailLevel, CriteriaDetail::fromName, o -> (Component.literal(o.getName()))

Forge/src/main/java/betteradvancements/forge/config/ConfigValues.java

@@ -21,6 +21,7 @@ public class ConfigValues {
     public static ForgeConfigSpec.BooleanValue showDebugCoordinates;
     public static ForgeConfigSpec.BooleanValue orderTabsAlphabetically;
     public static ForgeConfigSpec.IntValue uiScaling;
+    public static ForgeConfigSpec.FloatValue defaultZoom;
 
     public static ForgeConfigSpec.ConfigValue<String> detailLevel;
     public static ForgeConfigSpec.BooleanValue requiresShift;
@@ -45,6 +46,7 @@ public static ForgeConfigSpec build() {
         showDebugCoordinates = builder.define("showDebugCoordinates", false);
         orderTabsAlphabetically = builder.define("orderTabsAlphabetically", false);
         uiScaling = builder.comment("Values below 50% might give odd results, use on own risk ;)").defineInRange("uiScaling", 100, 1, 100);
+        defaultZoom = builder.comment("UI zoom steps are 0.1").defineInRange("defaultZoom", 1F, 0.4F, 2F);
 
         detailLevel = builder.comment(CriteriaDetail.comments()).defineInList("criteriaDetail", CriteriaDetail.DEFAULT.getName(), CriteriaDetail.names());
         requiresShift = builder.define("criteriaDetailRequiresShift", false);
@@ -70,6 +72,7 @@ public static void pushChanges() {
         BetterAdvancementsScreen.showDebugCoordinates = showDebugCoordinates.get();
         BetterAdvancementsScreen.orderTabsAlphabetically = orderTabsAlphabetically.get();
         BetterAdvancementsScreen.uiScaling = uiScaling.get();
+        BetterAdvancementsScreen.zoom = defaultZoom.get();
 
         CriterionGrid.detailLevel = CriteriaDetail.fromName(detailLevel.get());
         CriterionGrid.requiresShift = requiresShift.get();

NeoForge/src/main/java/betteradvancements/neoforge/config/ConfigValues.java

@@ -21,6 +21,7 @@ public class ConfigValues {
     public static ModConfigSpec.BooleanValue showDebugCoordinates;
     public static ModConfigSpec.BooleanValue orderTabsAlphabetically;
     public static ModConfigSpec.IntValue uiScaling;
+    public static ModConfigSpec.DoubleValue defaultZoom;
 
     public static ModConfigSpec.ConfigValue<String> detailLevel;
     public static ModConfigSpec.BooleanValue requiresShift;
@@ -45,6 +46,7 @@ public static ModConfigSpec build() {
         showDebugCoordinates = builder.define("showDebugCoordinates", false);
         orderTabsAlphabetically = builder.define("orderTabsAlphabetically", false);
         uiScaling = builder.comment("Values below 50% might give odd results, use on own risk ;)").defineInRange("uiScaling", 100, 1, 100);
+        defaultZoom = builder.comment("UI zoom steps are 0.1").defineInRange("defaultZoom", 1F, 0.4F, 2F);
 
         detailLevel = builder.comment(CriteriaDetail.comments()).defineInList("criteriaDetail", CriteriaDetail.DEFAULT.getName(), CriteriaDetail.names());
         requiresShift = builder.define("criteriaDetailRequiresShift", false);
@@ -70,6 +72,7 @@ public static void pushChanges() {
         BetterAdvancementsScreen.showDebugCoordinates = showDebugCoordinates.get();
         BetterAdvancementsScreen.orderTabsAlphabetically = orderTabsAlphabetically.get();
         BetterAdvancementsScreen.uiScaling = uiScaling.get();
+        BetterAdvancementsScreen.zoom = Math.round(defaultZoom.get());
 
         CriterionGrid.detailLevel = CriteriaDetail.fromName(detailLevel.get());
         CriterionGrid.requiresShift = requiresShift.get();