Skip to content

Commit

Permalink
1.20.4
Browse files Browse the repository at this point in the history
MicrocontrollersDev committed Jan 22, 2024
1 parent 3d14abf commit 93e9323
Showing 7 changed files with 20 additions and 28 deletions.
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'fabric-loom' version '1.3-SNAPSHOT'
id 'io.github.juuxel.loom-vineflower' version '1.11.0'
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'maven-publish'
}

@@ -16,7 +15,6 @@ repositories {
maven { url = "https://maven.isxander.dev/releases" }
maven { url = "https://maven.terraformersmc.com/releases" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url = "https://maven.quiltmc.org/repository/release" }
}

loom {
@@ -26,8 +24,6 @@ loom {
}

dependencies {
include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${mixinExtrasVersion}")))

modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:${yaclVersion}")

modImplementation("com.terraformersmc:modmenu:${project.modMenuVersion}")
13 changes: 6 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -4,17 +4,16 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.1
loader_version=0.14.22
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.6

# Mod Properties
mod_version=1.0.0
maven_group=com.mixces.oldanimations
archives_base_name=oldanimations

# Dependencies
fabric_version=0.89.2+1.20.2
mixinExtrasVersion=0.2.0-rc.5
modMenuVersion=8.0.0
yaclVersion=3.2.0+1.20.2
fabric_version=0.95.0+1.20.4
modMenuVersion=9.0.0
yaclVersion=3.3.2+1.20.4
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
17 changes: 9 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
@@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -144,15 +145,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=SC2039,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=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -201,11 +202,11 @@ 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
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
2 changes: 1 addition & 1 deletion src/main/java/com/mixces/oldanimations/OldAnimations.java
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ public class OldAnimations implements ModInitializer {

@Override
public void onInitialize() {
OldAnimationsSettings.load();
OldAnimationsSettings.CONFIG.load();
}

}
Original file line number Diff line number Diff line change
@@ -120,8 +120,4 @@ public static Screen configScreen(Screen parent) {
)).generateScreen(parent);
}

public static void load() {
OldAnimationsSettings.CONFIG.serializer().load();
}

}
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@
"oldanimations.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.22",
"minecraft": "1.20.2",
"fabricloader": ">=0.15.6",
"minecraft": "1.20.4",
"java": ">=17",
"fabric-api": "*",
"yet_another_config_lib_v3": "*"

0 comments on commit 93e9323

Please sign in to comment.