Skip to content

Commit

Permalink
Update to Minecraft 1.21.4
Browse files Browse the repository at this point in the history
Except I'm not making a 1.21.4 release exclusive to Fabric this way, I'm gonna make the 1.21.3 release compatible with 1.21.4 in a weird and bizarre way!
  • Loading branch information
EnnuiL committed Nov 27, 2024
1 parent 06ffac7 commit 3363915
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,11 @@ public void updateSizeAndPosition(int width, int height, int y) {
this.update();
}

@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);
Expand All @@ -310,6 +315,11 @@ protected void ensureVisible(int index) {
}
}

@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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public abstract class RenderStateShardMixin {
@Inject(
method = {
"method_62269",
"lambda$static$14()V"
"lambda$static$16()V"
},
at = @At("TAIL"),
allow = 1,
Expand All @@ -30,8 +30,8 @@ private static void fadeCrosshair(CallbackInfo ci) {

@Inject(
method = {
"method_62268",
"lambda$static$15()V"
"method_65205",
"lambda$static$17()V"
},
at = @At("HEAD"),
allow = 1,
Expand Down
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
modImplementation libs.fabric.api

modCompileOnly libs.modmenu
modLocalRuntime libs.modmenu
//modLocalRuntime libs.modmenu

modImplementation libs.wrench.wrapper

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# The latest versions are available at https://quiltmc.org/en/usage/latest-versions/
[versions]
minecraft = "1.21.3"
minecraft = "1.21.4-pre3"
parchment = "2024.11.17"

fabric_loom = "1.8.13"
fabric_loader = "0.16.9"
moddevgradle = "2.0.48-beta"
neoforge = "21.3.42-beta"

fabric_api = "0.110.0+1.21.3"
fabric_api = "0.110.0+1.21.4"
wrench_wrapper = "0.6.1"

modmenu = "12.0.0-beta.1"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ plugins {

rootProject.name = 'OkZoomer'

include('common', 'fabric', 'norge')
include('common', 'fabric')

0 comments on commit 3363915

Please sign in to comment.