Skip to content

Commit

Permalink
Switch to 1.21.4 as core version
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaming32 committed Dec 3, 2024
1 parent 7c28b78 commit 531060e
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,12 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
return (entry != null && entry.keyPressed(keyCode, scanCode, modifiers)) || super.keyPressed(keyCode, scanCode, modifiers);
}

@Override
protected int getScrollbarPosition() {
return super.getScrollbarPosition() + 30;
}
//#if MC < 1.21.4
//$$ @Override
//$$ protected int getScrollbarPosition() {
//$$ return super.getScrollbarPosition() + 30;
//$$ }
//#endif

@Override
public int getRowWidth() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,30 @@ private void addButtons(int fromI) {
}

public int getVisibleCount() {
return Math.min(users.size(), getHeight() / 24);
//#if MC >= 1.21.4
return users.size();
//#else
//$$ return Math.min(users.size(), getHeight() / 24);
//#endif
}

@Override
public @NotNull List<? extends GuiEventListener> children() {
return actionButtons;
}

//#if MC >= 1.21.4
@Override
protected int contentHeight() {
return 24 * users.size();
}

@Override
protected double scrollRate() {
return 12.0;
}
//#endif

//#if MC < 1.19.4
//$$ private int getX() {
//$$ return x;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ modId = "minecraft"
##elseif MC == 1.21.1
#?? versionRange = "[1.21.0,1.21.2)"
##elseif MC == 1.21.3
versionRange = "[1.21.2,1.21.4)"
#?? versionRange = "[1.21.2,1.21.4)"
##else
#?? versionRange = "[$mc_version]"
versionRange = "[$mc_version]"
##endif
type = "required"
ordering = "NONE"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
//#elseif MC == 1.21.1
//?? "minecraft": ">=1.21.0 <1.21.2",
//#elseif MC == 1.21.3
"minecraft": ">=1.21.2 <1.21.4",
//?? "minecraft": ">=1.21.2 <1.21.4",
//#else
//?? "minecraft": "$mc_version",
"minecraft": "$mc_version",
//#endif
"fabric-resource-loader-v0": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion versions/mainProject
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.3-fabric
1.21.4-fabric

0 comments on commit 531060e

Please sign in to comment.