Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,15 +35,15 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
-        - "1.20.4"
+        - "1.20.6"
     validations:
       required: true
   - type: input
     id: skyblocker-version
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-1.19.0+1.20.4.jar
+      placeholder: ex. skyblocker-1.20.3+1.20.6.jar
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -16,15 +16,15 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
-        - "1.20.4"
+        - "1.20.6"
     validations:
       required: true
   - type: input
     id: skyblocker-version
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-1.19.0+1.20.4.jar
+      placeholder: ex. skyblocker-1.20.3+1.20.6.jar
     validations:
       required: true
   - type: textarea

.github/workflows/beta.yml

@@ -59,6 +59,15 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
 
+      - name: Store reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: reports
+          path: |
+            **/build/reports/
+            **/build/test-results/
+
       - uses: actions/github-script@v7
         id: fname
         with:

README.md

@@ -10,7 +10,7 @@
 [![Ko-fi](https://img.shields.io/badge/buy%20me%20coffee-skyblocker?color=434B57&logo=kofi)](https://ko-fi.com/wohlhabend)
 [![Translated](https://translate.hysky.de/widgets/Skyblocker/-/skyblocker/svg-badge.svg)](https://translate.hysky.de/projects/Skyblocker/skyblocker/)
 
-Hypixel Skyblock Mod for Minecraft 1.20.4
+Hypixel Skyblock Mod for Minecraft 1.20.6
 
 Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) or use our [Modpack](https://modrinth.com/modpack/skyblocker-modpack)
 ## Features

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
@@ -36,14 +36,19 @@ dependencies {
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	//Layered Yarn & Mojmap - used to fill in intermediary names
+	mappings loom.layered {
+		//Using Mojmap breaks runClient, so uncomment only for snapshots when temp mappings are needed
+		//officialMojangMappings()
+		mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
+	}
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// YACL
-	include modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}")
+	include modImplementation("dev.isxander:yet-another-config-lib:${project.yacl_version}-fabric")
 
 	// Mod Menu
 	modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
@@ -92,17 +97,12 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -3,19 +3,19 @@ org.gradle.parallel=true
 
 # Fabric Properties (https://fabricmc.net/versions.html)
 ## 1.20
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.1
-loader_version=0.15.1
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.10
 
 #Fabric api
 ## 1.20
-fabric_api_version=0.92.0+1.20.4
+fabric_api_version=0.97.8+1.20.6
 
 # Minecraft Mods
 ## YACL (https://github.com/isXander/YetAnotherConfigLib)
-yacl_version=3.3.2+1.20.4
+yacl_version=3.4.1+1.20.5
 ## Mod Menu (https://modrinth.com/mod/modmenu/versions)
-mod_menu_version = 9.0.0-alpha.3
+mod_menu_version = 10.0.0-beta.1
 ## REI (https://modrinth.com/mod/rei/versions?l=fabric)
 rei_version = 13.0.666
 ## EMI (https://modrinth.com/mod/emi/versions)
@@ -25,11 +25,11 @@ emi_version = 1.0.22+1.20.2
 ## Occlusion Culling (https://github.com/LogisticsCraft/OcclusionCulling)
 occlusionculling_version = 0.0.8-SNAPSHOT
 ## neu repoparser (https://repo.nea.moe/#/releases/moe/nea/neurepoparser/)
-repoparser_version = 1.4.0
+repoparser_version = 1.5.0
 
 # Other Libraries
 ## JGit (https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit)
-jgit_version = 6.8.0.202311291450-r
+jgit_version = 6.9.0.202403050737-r
 ## Apache Commons Math (https://mvnrepository.com/artifact/org.apache.commons/commons-math3)
 commons_math_version = 3.6.1
 

src/main/java/de/hysky/skyblocker/SkyblockerMod.java

@@ -136,6 +136,7 @@ public void onInitializeClient() {
         LividColor.init();
         FishingHelper.init();
         DungeonMap.init();
+        DungeonScoreHUD.init();
         DungeonManager.init();
         DungeonBlaze.init();
         Waterboard.init();

src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java

@@ -6,7 +6,6 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
-import net.minecraft.util.math.MathHelper;
 
 import java.awt.*;
 import java.util.List;
@@ -70,8 +69,8 @@ protected void renderWidget(DrawContext context, List<Widget> widgets) {
     @Override
     public final boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
         if (button == 0 && draggingWidget != null) {
-            draggingWidget.setX((int) MathHelper.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth()));
-            draggingWidget.setY((int) MathHelper.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight()));
+            draggingWidget.setX((int) Math.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth()));
+            draggingWidget.setY((int) Math.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight()));
         }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
     }

src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java

@@ -8,6 +8,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -85,7 +86,7 @@ private static void update(int retries) {
 					update(retries + 1);
 				}
 			}
-		});
+		}, Executors.newVirtualThreadPerTaskExecutor());
 	}
 
 	/**
@@ -96,7 +97,7 @@ private static String checkSavedCommitData() throws IOException {
 
 		if (Files.exists(file)) {
 			try (BufferedReader reader = Files.newBufferedReader(file)) {
-				CommitData commitData = CommitData.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).result().orElseThrow();
+				CommitData commitData = CommitData.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).getOrThrow();
 
 				return commitData.commit();
 			}
@@ -115,7 +116,7 @@ private static void writeCommitData(String newHash) throws IOException {
 		CommitData commitData = new CommitData(newHash, System.currentTimeMillis());
 
 		try (BufferedWriter writer = Files.newBufferedWriter(file)) {
-			SkyblockerMod.GSON.toJson(CommitData.CODEC.encodeStart(JsonOps.INSTANCE, commitData).result().orElseThrow(), writer);
+			SkyblockerMod.GSON.toJson(CommitData.CODEC.encodeStart(JsonOps.INSTANCE, commitData).getOrThrow(), writer);
 		}
 	}
 

src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java

@@ -4,7 +4,7 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.categories.*;
-import de.hysky.skyblocker.mixin.accessor.HandledScreenAccessor;
+import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import dev.isxander.yacl3.api.YetAnotherConfigLib;
 import dev.isxander.yacl3.config.v2.api.ConfigClassHandler;

src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java

@@ -4,6 +4,7 @@
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
+import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionGroup;
 import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.StringControllerBuilder;
@@ -51,6 +52,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button1.item.nbt,
 										() -> config.quickNav.button1.item.nbt,
 										newValue -> config.quickNav.button1.item.nbt = newValue)
@@ -99,6 +101,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button2.item.nbt,
 										() -> config.quickNav.button2.item.nbt,
 										newValue -> config.quickNav.button2.item.nbt = newValue)
@@ -147,6 +150,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button3.item.nbt,
 										() -> config.quickNav.button3.item.nbt,
 										newValue -> config.quickNav.button3.item.nbt = newValue)
@@ -195,6 +199,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button4.item.nbt,
 										() -> config.quickNav.button4.item.nbt,
 										newValue -> config.quickNav.button4.item.nbt = newValue)
@@ -243,6 +248,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button5.item.nbt,
 										() -> config.quickNav.button5.item.nbt,
 										newValue -> config.quickNav.button5.item.nbt = newValue)
@@ -291,6 +297,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button6.item.nbt,
 										() -> config.quickNav.button6.item.nbt,
 										newValue -> config.quickNav.button6.item.nbt = newValue)
@@ -339,6 +346,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button7.item.nbt,
 										() -> config.quickNav.button7.item.nbt,
 										newValue -> config.quickNav.button7.item.nbt = newValue)
@@ -387,6 +395,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button8.item.nbt,
 										() -> config.quickNav.button8.item.nbt,
 										newValue -> config.quickNav.button8.item.nbt = newValue)
@@ -435,6 +444,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button9.item.nbt,
 										() -> config.quickNav.button9.item.nbt,
 										newValue -> config.quickNav.button9.item.nbt = newValue)
@@ -483,6 +493,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button10.item.nbt,
 										() -> config.quickNav.button10.item.nbt,
 										newValue -> config.quickNav.button10.item.nbt = newValue)
@@ -531,6 +542,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button11.item.nbt,
 										() -> config.quickNav.button11.item.nbt,
 										newValue -> config.quickNav.button11.item.nbt = newValue)
@@ -579,6 +591,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
 								.binding(defaults.quickNav.button12.item.nbt,
 										() -> config.quickNav.button12.item.nbt,
 										newValue -> config.quickNav.button12.item.nbt = newValue)