Merge pull request #898 from SkyblockerMod/1.21.1

1.21.1

7 files changed, 13 insertions, 31 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b71044a8..58182379 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,7 +35,7 @@ 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.21.0"
+        - "1.21.0/1.21.1"
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml
index 44d6b91b..08dfa9d2 100644
--- a/.github/ISSUE_TEMPLATE/crash_report.yml
+++ b/.github/ISSUE_TEMPLATE/crash_report.yml
@@ -16,7 +16,7 @@ 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.21.0"
+        - "1.21.0/1.21.1"
     validations:
       required: true
   - type: input
diff --git a/README.md b/README.md
index 05d04d9b..9f73ea58 100644
--- a/README.md
+++ b/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.21
+Hypixel Skyblock Mod for Minecraft 1.21 & 1.21.1
 
 Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) or use our [Modpack](https://modrinth.com/modpack/skyblocker-modpack)
 ## Features
diff --git a/gradle.properties b/gradle.properties
index 44dd80fb..cbf62352 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,14 +2,14 @@ org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.countr
 org.gradle.parallel=true
 
 # Fabric Properties (https://fabricmc.net/versions.html)
-## 1.20
-minecraft_version=1.21
-yarn_mappings=1.21+build.1
+## 1.21.1
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.1
 loader_version=0.15.11
 
 #Fabric api
-## 1.20
-fabric_api_version=0.100.1+1.21
+## 1.21.1
+fabric_api_version=0.102.0+1.21.1
 
 # Minecraft Mods
 ## YACL (https://github.com/isXander/YetAnotherConfigLib)
@@ -33,7 +33,7 @@ repoparser_version = 1.5.0
 
 # Other Libraries
 ## JGit (https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit)
-jgit_version = 6.9.0.202403050737-r
+jgit_version = 6.10.0.202406032230-r
 ## Apache Commons Math (https://mvnrepository.com/artifact/org.apache.commons/commons-math3)
 commons_math_version = 3.6.1
 ## Apache Commons Text (https://mvnrepository.com/artifact/org.apache.commons/commons-text)
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
index 511827b9..f81fae0c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
@@ -282,13 +282,13 @@ public class Waterboard extends DungeonPuzzle {
                 // Check if left down is in range and is closer than right down.
                 // Note 1: The yarn name "getFlowSpeed" is incorrect as it actually returns the maximum distance that water will check for a hole to flow towards.
                 // Note 2: Skyblock's maximum offset is 5 instead of 4 for some reason.
-                if (-leftFlowDownOffset <= ((WaterFluid) Fluids.WATER).getFlowSpeed(null) + 1 && -leftFlowDownOffset < rightFlowDownOffset) {
+                if (-leftFlowDownOffset <= ((WaterFluid) Fluids.WATER).getMaxFlowDistance(null) + 1 && -leftFlowDownOffset < rightFlowDownOffset) {
                     result.putPath(water, leftFlowDownOffset);
                     water.add(leftFlowDownOffset, 1);
                     continue;
                 }
                 // Check if right down is in range and closer than left down.
-                if (rightFlowDownOffset <= ((WaterFluid) Fluids.WATER).getFlowSpeed(null) + 1 && rightFlowDownOffset < -leftFlowDownOffset) {
+                if (rightFlowDownOffset <= ((WaterFluid) Fluids.WATER).getMaxFlowDistance(null) + 1 && rightFlowDownOffset < -leftFlowDownOffset) {
                     result.putPath(water, rightFlowDownOffset);
                     water.add(rightFlowDownOffset, 1);
                     continue;
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 1361c00a..f7a2273c 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -34,14 +34,14 @@
   "accessWidener": "skyblocker.accesswidener",
   "depends": {
     "fabricloader": ">=0.15.11",
-    "fabric-api": ">=0.100.1+1.21",
+    "fabric-api": ">=0.102.0+1.21.1",
     "yet_another_config_lib_v3": ">=3.5.0+1.21",
     "hm-api": ">=1.0.0+1.21",
     "minecraft": "~1.21",
     "java": ">=21"
   },
   "conflicts": {
-    "immediatelyfast": "<=1.2.18+1.21"
+    "immediatelyfast": "*"
   },
   "breaks": {
     "forcecloseworldloadingscreen": "<=2.2.0"
diff --git a/src/main/resources/skyblocker.accesswidener b/src/main/resources/skyblocker.accesswidener
index 136124b7..c5d379cf 100644
--- a/src/main/resources/skyblocker.accesswidener
+++ b/src/main/resources/skyblocker.accesswidener
@@ -1,21 +1,3 @@
 accessWidener v2 named
 
-accessible class net/minecraft/client/render/RenderLayer$MultiPhase
-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
-accessible class net/minecraft/client/render/RenderPhase$Transparency
-accessible class net/minecraft/client/render/RenderPhase$ShaderProgram
-accessible class net/minecraft/client/render/RenderPhase$Texture
-accessible class net/minecraft/client/render/RenderPhase$TextureBase
-accessible class net/minecraft/client/render/RenderPhase$Texturing
-accessible class net/minecraft/client/render/RenderPhase$Lightmap
-accessible class net/minecraft/client/render/RenderPhase$Overlay
-accessible class net/minecraft/client/render/RenderPhase$Cull
-accessible class net/minecraft/client/render/RenderPhase$DepthTest
-accessible class net/minecraft/client/render/RenderPhase$WriteMaskState
-accessible class net/minecraft/client/render/RenderPhase$Layering
-accessible class net/minecraft/client/render/RenderPhase$Target
-accessible class net/minecraft/client/render/RenderPhase$LineWidth
-accessible class net/minecraft/client/render/RenderPhase$ColorLogic
-accessible class net/minecraft/client/render/RenderPhase$OffsetTexturing
-accessible class net/minecraft/client/render/RenderPhase$Textures
 accessible field net/minecraft/command/argument/BlockPosArgumentType EXAMPLES Ljava/util/Collection;