Skip to content

Commit

Permalink
Updated to 1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
r8420 committed Feb 2, 2024
1 parent 989860a commit 1a50cce
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'maven-publish'
// MixinGradle:
apply plugin: 'org.spongepowered.mixin'

version = '1.22.2-mc1.20.2'
version = '1.22.3-mc1.20.4'
group = 'at.ridgo8.moreoverlays' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'moreoverlays'

Expand All @@ -45,7 +45,7 @@ minecraft {
//
// Use non-default mappings at your own risk. They may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'official', version: '1.20.2'
mappings channel: 'official', version: '1.20.4'

// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

forge_version=1.20.2-48.0.0
mc_version=1.20.1
jei_version=15.2.0.27
forge_version=1.20.4-49.0.27
mc_version=1.20.4
jei_version=17.3.0.48
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class ConfigOptionList extends ContainerObjectSelectionList<ConfigOptionL

public ConfigOptionList(Minecraft minecraft, String modId, ConfigScreen configs) {
// Width, Height, Y-Start, Y-End, item_height
super(minecraft, configs.width, configs.height, 43, configs.height - 32, ITEM_HEIGHT);
super(minecraft, configs.width, configs.height - 32, 43, ITEM_HEIGHT);
this.parent = configs;
this.modId = modId;
}
Expand All @@ -63,7 +63,8 @@ public int getRowWidth() {
}

public void updateGui() {
this.updateSize(this.parent.width, this.parent.height, 43, this.parent.height - 32);
// this.setRectangle(this.parent.width, this.parent.height, 43, this.parent.height - 32);
this.setSize(this.parent.width, this.parent.height - 32);
}


Expand All @@ -73,7 +74,7 @@ protected void renderDecorations(GuiGraphics guiGraphics, int p_renderDecoration
for (int j = 0; j < i; ++j) {
int k = this.getRowTop(j);
int l = this.getRowTop(j) + ITEM_HEIGHT;
if (l >= this.y0 && k <= this.y1) {
if (l >= this.getY() && k <= this.getBottom()) {
ConfigOptionList.OptionEntry e = this.getEntry(j);
e.runRenderTooltip(guiGraphics);
}
Expand Down

0 comments on commit 1a50cce

Please sign in to comment.