Skip to content

Commit

Permalink
Update to 1.20.5-rc.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Prospector committed Apr 22, 2024
1 parent 07e4804 commit 0cf8d3e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'fabric-loom' version '1.1-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
}

apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.5/ferry.gradle'
apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle'

dependencies {
minecraft "com.mojang:minecraft:$project.minecraft_version"
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
maven_group=com.terraformersmc
archive_name=modmenu

minecraft_version=24w10a
yarn_mappings=24w10a+build.4
loader_version=0.15.7
fabric_version=0.96.8+1.20.5
minecraft_version=1.20.5-rc3
yarn_mappings=1.20.5-rc3+build.2
loader_version=0.15.10
fabric_version=0.97.5+1.20.5
quilt_loader_version=0.17.7

# Project Metadata
Expand All @@ -20,7 +20,7 @@ default_release_type=stable
# Modrinth Metadata
modrinth_slug=modmenu
modrinth_id=mOgUt4GM
modrinth_game_versions=24w10a
modrinth_game_versions=1.20.5-rc3
modrinth_mod_loaders=fabric, quilt

# CurseForge Metadata
Expand Down
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public int getRowWidth() {
}

@Override
protected int getScrollbarPositionX() {
protected int getScrollbarX() {
return this.width - 6 + this.getX();
}

Expand Down Expand Up @@ -321,7 +321,7 @@ public void renderList(DrawContext DrawContext, int mouseX, int mouseY, float de
}

public void renderScrollBar(BufferBuilder bufferBuilder, Tessellator tessellator) {
int scrollbarStartX = this.getScrollbarPositionX();
int scrollbarStartX = this.getScrollbarX();
int scrollbarEndX = scrollbarStartX + 6;
int maxScroll = this.getMaxScroll();
if (maxScroll > 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public void ensureVisible(ModListEntry entry) {
@Override
protected void updateScrollingState(double double_1, double double_2, int int_1) {
super.updateScrollingState(double_1, double_2, int_1);
this.scrolling = int_1 == 0 && double_1 >= (double) this.getScrollbarPositionX() && double_1 < (double) (this.getScrollbarPositionX() + 6);
this.scrolling = int_1 == 0 && double_1 >= (double) this.getScrollbarX() && double_1 < (double) (this.getScrollbarX() + 6);
}

@Override
Expand Down Expand Up @@ -285,11 +285,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
public final ModListEntry getEntryAtPos(double x, double y) {
int int_5 = MathHelper.floor(y - (double) this.getY()) - this.headerHeight + (int) this.getScrollAmount() - 4;
int index = int_5 / this.itemHeight;
return x < (double) this.getScrollbarPositionX() && x >= (double) getRowLeft() && x <= (double) (getRowLeft() + getRowWidth()) && index >= 0 && int_5 >= 0 && index < this.getEntryCount() ? this.children().get(index) : null;
return x < (double) this.getScrollbarX() && x >= (double) getRowLeft() && x <= (double) (getRowLeft() + getRowWidth()) && index >= 0 && int_5 >= 0 && index < this.getEntryCount() ? this.children().get(index) : null;
}

@Override
protected int getScrollbarPositionX() {
protected int getScrollbarX() {
return this.width - 6;
}

Expand Down

0 comments on commit 0cf8d3e

Please sign in to comment.