Merge branch '1.20.4' into 1.20.6

common/src/main/java/xaeroplus/mixin/client/MixinGuiWaypointsOptions.java

@@ -0,0 +1,52 @@
+package xaeroplus.mixin.client;
+
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import xaero.common.IXaeroMinimap;
+import xaero.common.gui.GuiWaypointsOptions;
+import xaero.common.gui.MyBigButton;
+import xaero.common.gui.ScreenBase;
+import xaeroplus.settings.Settings;
+
+@Mixin(value = GuiWaypointsOptions.class, remap = false)
+public abstract class MixinGuiWaypointsOptions extends ScreenBase {
+    @Unique
+    private Button showWaypointDistancesButton;
+
+    protected MixinGuiWaypointsOptions(final IXaeroMinimap modMain, final Screen parent, final Screen escape, final Component titleIn) {
+        super(modMain, parent, escape, titleIn);
+    }
+
+    @Inject(
+        method = "init",
+        at = @At("RETURN"),
+        remap = true
+    )
+    public void injectShowWaypointDistancesButton(final CallbackInfo ci) {
+        int prevButtonY = this.children().stream()
+            .filter(c -> c instanceof MyBigButton)
+            .map(c -> (MyBigButton) c)
+            .filter(c -> c.getId() == 203)
+            .findFirst()
+            .map(AbstractWidget::getY)
+            .orElse(280);
+        addRenderableWidget(
+            showWaypointDistancesButton = new MyBigButton(
+                999,
+                this.width / 2 + 3,
+                prevButtonY + 25,
+                Component.literal(Settings.REGISTRY.showWaypointDistances.getTranslatedName()),
+                (b) -> {
+                    Settings.REGISTRY.showWaypointDistances.setValue(!Settings.REGISTRY.showWaypointDistances.get());
+                }
+            )
+        );
+    }
+}

common/src/main/resources/xaeroplus.mixins.json

@@ -32,6 +32,7 @@
     "MixinGuiWaypoints",
     "MixinGuiWaypointSettings",
     "MixinGuiWaypointsList",
+    "MixinGuiWaypointsOptions",
     "MixinGuiWorldMapSettings",
     "MixinHudMod",
     "MixinImprovedFramebuffer",

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum