aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java4
-rw-r--r--src/main/resources/fabric.mod.json4
-rw-r--r--src/main/resources/skyblocker.accesswidener18
3 files changed, 4 insertions, 22 deletions
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;