Skip to content

Commit

Permalink
change: Backport to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
FlashyReese committed Jan 28, 2024
1 parent 381552d commit 93c65ce
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "me.jellysquid.mods:sodium-fabric:0.5.6-snapshot+mc1.20.3-build.1"
//modImplementation "maven.modrinth:sodium:${project.sodium_version}"
//modImplementation "me.jellysquid.mods:sodium-fabric:0.5.6-snapshot+mc1.20.3-build.1"
modImplementation "maven.modrinth:sodium:${project.sodium_version}"
/*modImplementation("me.flashyreese.mods:reeses-sodium-options:${project.reeses_sodium_options}") {
exclude group: "net.coderbot.iris_mc1_19", module: "iris"
}*/
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.15.6

# Mod Properties
Expand All @@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1G
archives_base_name=sodium-extra

# Dependencies
reeses_sodium_options=1.5.1+mc1.20-build.74
sodium_version=mc1.20.3-0.5.5
fabric_version=0.95.1+1.20.4
reeses_sodium_options=1.7.1+mc1.20.1-build.99
sodium_version=mc1.20.1-0.5.6
fabric_version=0.91.0+1.20.1
crowdin_translate=1.4+1.19.3
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void onStartTick(MinecraftClient client) {
}
@Override
public void onHudRender(DrawContext drawContext, float tickDelta) {
if (!client.getDebugHud().shouldShowDebugHud()) {
if (!this.client.hasReducedDebugInfo()) {
SodiumExtraGameOptions.OverlayCorner overlayCorner = SodiumExtraClientMod.options().extraSettings.overlayCorner;
// Calculate starting position based on the overlay corner
int x;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
}

@Override
public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
if (super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) {
public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
if (super.mouseScrolled(mouseX, mouseY, amount)) {
return true;
}
if (this.canScroll) {
return this.scrollBar.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
return this.scrollBar.mouseScrolled(mouseX, mouseY, amount);
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
}

@Override
public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) {
if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) {
int value = (int) (this.offset - verticalAmount * 6); // todo: horizontalAmount
int value = (int) (this.offset - amount * 6); // todo: horizontalAmount
this.setOffset(value);
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"fabricloader": ">=0.14",
"fabric-api": "*",
"sodium": ">=0.5.6",
"minecraft": ">=1.20.2"
"minecraft": ">=1.20.1"
},
"breaks": {
"reeses-sodium-options": "<1.4.2"
Expand Down

0 comments on commit 93c65ce

Please sign in to comment.