Update to 1.21.4

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Skyblock Mod 1.10.7 for 1.21.4
+
+Support for 1.21.4
+
+
 ## Skyblock Mod 1.10.6 for 1.21.3
 
 Support for 1.21.3

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 	id "me.modmuss50.mod-publish-plugin" version "0.8.1"
 }
@@ -113,17 +113,17 @@ publishMods {
 		projectSlug = "skyblockmod" // Required for discord webhook
 		accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
 		minecraftVersionRange {
-			start = "1.21.2"
-			end = "1.21.3"
+			start = "1.21.4"
+			end = "1.21.4"
 		}
 		requires("fabric-api")
 	}
 	modrinth {
 		projectId = "GTIrlvJk"
 		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
 		minecraftVersionRange {
-			start = "1.21.2"
-			end = "1.21.3"
+			start = "1.21.4"
+			end = "1.21.4"
 		}
 	}
 	github {

gradle.properties

@@ -3,19 +3,19 @@ org.gradle.jvmargs = -Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version = 1.21.3
-	yarn_mappings = 1.21.3+build.2
+	minecraft_version = 1.21.4
+	yarn_mappings = 1.21.4+build.1
 	loader_version = 0.16.9
 
 # Mod Properties
-	mod_version = 1.10.6
+	mod_version = 1.10.7
 	maven_group = com.kevinthegreat.skyblockmod
 	archives_base_name = skyblock-mod
 
 # Dependencies
-	fabric_version = 0.110.0+1.21.3
+	fabric_version = 0.110.5+1.21.4
 	# https://modrinth.com/mod/modmenu/versions
-	modmenu_version = 12.0.0-beta.1
+	modmenu_version = 13.0.0-beta.1
 	# https://modrinth.com/mod/skyblocker-liap/versions
 	skyblocker_version = 1.23.0-beta.1+1.21.3
 	# https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

src/main/java/com/kevinthegreat/skyblockmod/waypoint/DropdownWidget.java

@@ -21,12 +21,11 @@ public class DropdownWidget<T> extends ElementListWidget<DropdownWidget.Entry<T>
     protected boolean open;
 
     public DropdownWidget(MinecraftClient minecraftClient, int x, int y, int width, int maxHeight, List<T> entries, Consumer<T> selectCallback, T selected) {
-        super(minecraftClient, width, Math.min((entries.size() + 1) * ENTRY_HEIGHT + 8, maxHeight), y, ENTRY_HEIGHT);
+        super(minecraftClient, width, Math.min((entries.size() + 1) * ENTRY_HEIGHT + 8, maxHeight), y, ENTRY_HEIGHT, ENTRY_HEIGHT + 4);
         setX(x);
         this.entries = entries;
         this.selectCallback = selectCallback;
         this.selected = selected;
-        setRenderHeader(true, ENTRY_HEIGHT + 4);
         for (T entry : entries) {
             addEntry(new Entry<>(this, entry));
         }
@@ -43,9 +42,19 @@ public int getRowWidth() {
     }
 
     @Override
-    protected boolean clickedHeader(int x, int y) {
-        open = !open;
-        return true;
+    protected int getScrollbarX() {
+        return getRowRight() + 2;
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (super.mouseClicked(mouseX, mouseY, button)) return true;
+
+        if (this.getEntryAtPosition(mouseX, mouseY) == null && (open || this.isMouseOver(mouseX, mouseY))) {
+            open = !open;
+            return true;
+        }
+        return false;
     }
 
     @Override
@@ -58,8 +67,8 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
         context.getMatrices().push();
         context.getMatrices().translate(0, 0, 100);
 
-        int y = getY() - (int) getScrollAmount();
-        int height = getMaxPosition();
+        int y = getY() - (int) getScrollY();
+        int height = getContentsHeightWithPadding();
 
         context.fill(getX(), y, getX() + width, y + headerHeight, 0xFF000000);
         context.drawHorizontalLine(getX(), getX() + width, y, 0xFFFFFFFF);
@@ -95,7 +104,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou
     protected void select(T entry) {
         selected = entry;
         open = false;
-        setScrollAmount(0);
+        setScrollY(0);
         if (selected != prevSelected) {
             selectCallback.accept(entry);
             prevSelected = selected;