diff --git a/.editorconfig b/.editorconfig index aa345f3..2d4e5ab 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,5 +11,5 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false -[{*.yml, *.json}] +[{*.yml,*.json}] indent_size = 2 diff --git a/build.gradle b/build.gradle index bab2cda..7817d00 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'maven-publish' } -group projGroupId +group = projGroupId version = projVersion repositories { diff --git a/gradle.properties b/gradle.properties index 176f382..8100757 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 projGroupId=io.github.over-run projArtifactId=timer projName=timer -projVersion=0.2.0 +projVersion=0.3.0 projDesc=A Java game loop timer. projVcs=Over-Run/timer projBranch=0.x diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..fcb6fca 100644 --- a/gradlew +++ b/gradlew @@ -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 @@ -133,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -197,6 +197,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 diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..d715731 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,25 @@ +/* + * MIT License + * + * Copyright (c) 2023 Overrun Organization + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + */ + +/** + * @author squid233 + * @since 0.3.0 + */ +module org.overrun.timer { + exports org.overrun.timer; + + requires static org.jetbrains.annotations; +} diff --git a/src/main/java/org/overrun/timer/Timer.java b/src/main/java/org/overrun/timer/Timer.java index 1e35269..44dd09c 100644 --- a/src/main/java/org/overrun/timer/Timer.java +++ b/src/main/java/org/overrun/timer/Timer.java @@ -162,6 +162,7 @@ static DefaultTimer ofSystem(double ticksPerSecond) { * Calculates the FPS. * * @see #calcFPS(IntConsumer) + * @since 0.2.0 */ default void calcFPS() { calcFPS(null); @@ -172,7 +173,7 @@ default void calcFPS() { * * @param action the action to be performed. */ - default void performTicks(Runnable action) { + default void performTicks(@Nullable Runnable action) { if (action != null) { for (int i = 0, count = tickCount(); i < count; i++) { action.run();