diff --git a/common/src/main/java/io/github/ennuil/ok_zoomer/config/screen/components/OkZoomerAbstractSelectionList.java b/common/src/main/java/io/github/ennuil/ok_zoomer/config/screen/components/OkZoomerAbstractSelectionList.java index 5c208d46..0f140a0f 100644 --- a/common/src/main/java/io/github/ennuil/ok_zoomer/config/screen/components/OkZoomerAbstractSelectionList.java +++ b/common/src/main/java/io/github/ennuil/ok_zoomer/config/screen/components/OkZoomerAbstractSelectionList.java @@ -295,6 +295,12 @@ public void updateSizeAndPosition(int width, int height, int y) { this.update(); } + // 1.21.4-exclusive method + // @Override + protected int contentHeight() { + return this.contentHeight; + } + protected void ensureVisible(int index) { int rowTop = this.getRowTop(index); int rowTop2 = rowTop - this.getY() - 4 - entryHeights.getInt(index); @@ -310,6 +316,12 @@ protected void ensureVisible(int index) { } } + // 1.21.4-exclusive method + //@Override + protected double scrollRate() { + return 10.0; + } + // This is so faithful to Vanilla's algo that it also inherits the Bottom Void Pixel of Doom! Oh no! protected final Entry getEntryAtPosition(double x, double y) { int center = this.getX() + this.width / 2; diff --git a/common/src/main/java/io/github/ennuil/ok_zoomer/mixin/common/RenderStateShardMixin.java b/common/src/main/java/io/github/ennuil/ok_zoomer/mixin/common/RenderStateShardMixin.java index a1073975..e4f7f60d 100644 --- a/common/src/main/java/io/github/ennuil/ok_zoomer/mixin/common/RenderStateShardMixin.java +++ b/common/src/main/java/io/github/ennuil/ok_zoomer/mixin/common/RenderStateShardMixin.java @@ -31,6 +31,7 @@ private static void fadeCrosshair(CallbackInfo ci) { @Inject( method = { "method_62268", + "method_65205", // Intermediary 1.21.4 "lambda$static$15()V" }, at = @At("HEAD"), diff --git a/norge/src/main/resources/META-INF/neoforge.mods.toml b/norge/src/main/resources/META-INF/neoforge.mods.toml index d9351b74..af8e0937 100644 --- a/norge/src/main/resources/META-INF/neoforge.mods.toml +++ b/norge/src/main/resources/META-INF/neoforge.mods.toml @@ -28,7 +28,7 @@ side = "CLIENT" [[dependencies.ok_zoomer]] modId = "minecraft" type = "required" -versionRange = "[1.21.2,1.22)" +versionRange = "[1.21.2,1.21.4)" ordering = "NONE" side = "CLIENT"