diff --git a/.classpath b/.classpath deleted file mode 100755 index a20094d..0000000 --- a/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..567d4e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.bat text eol=crlf +gradlew text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df892ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +bin/ +libs/ +.idea/ +.gradle/ +build/ +out/ + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +run/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3bc932d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/tenkumaLib"] + path = libs/tenkumaLib + url = ssh://forgejo@inspiran.beetal-castor.ts.net/tenkuma/tenkumaLib.git diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b1f0454 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +run/ +.gradle \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ccbebcb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..69c6377 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..04be522 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..90d9e69 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/TimeKeeper.main.iml b/.idea/modules/TimeKeeper.main.iml new file mode 100644 index 0000000..a8ac93b --- /dev/null +++ b/.idea/modules/TimeKeeper.main.iml @@ -0,0 +1,22 @@ + + + + + + + + + + + + PAPER + ADVENTURE + + 1 + + + + + + \ No newline at end of file diff --git a/.idea/modules/TimeKeeper.test.iml b/.idea/modules/TimeKeeper.test.iml new file mode 100644 index 0000000..9376acd --- /dev/null +++ b/.idea/modules/TimeKeeper.test.iml @@ -0,0 +1,17 @@ + + + + + + + PAPER + ADVENTURE + + 1 + + + + + + \ No newline at end of file diff --git a/.idea/modules/libs/tenkumaLib/TimeKeeper.tenkumaLib.main.iml b/.idea/modules/libs/tenkumaLib/TimeKeeper.tenkumaLib.main.iml new file mode 100644 index 0000000..9376acd --- /dev/null +++ b/.idea/modules/libs/tenkumaLib/TimeKeeper.tenkumaLib.main.iml @@ -0,0 +1,17 @@ + + + + + + + PAPER + ADVENTURE + + 1 + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..441ec02 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100755 index 9296415..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - TimeKeeper - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 4824b80..99f26c0 100755 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index f1d5502..773760f 100755 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/README.md b/README.md index 1e8e649..7812be7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,13 @@ This is a plugin for Minecraft beta that syncs the real world time with your in-game time. ## How it works -It will calculate and change the game time every second (that's 20 ticks and that can be changed in the config), it will use your computer's timezone as default if the config `timezone` value does not exist. +TimeKeeper changes the game time every tick (that can be changed in the config), using your computer timezone as default if the config `timezone` value does not exist. + +## Config +```yaml +ticksBetweenUpdate: 0 # 20 ticks is 1 second +timezone: "America/Sao_Paulo" # comment this line to use system's default timezone +preventSleep: true # Players will sleep and time will sync afterwards, so it's better to disable unless you have a reason to +worlds: + - "world" +``` \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..bc40598 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,164 @@ +plugins { + java + id("xyz.jpenilla.run-paper") version "3.0.1" +} + +group = "org.adrianvictor" +version = System.getenv("TKEEPER_VERSION_NAME") ?: "unknown" + +repositories { + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + flatDir { + dirs("libs") + } +} + +/* ----------------------------------------- */ +/* SUPPORTED VERSIONS */ +/* ----------------------------------------- */ + +val mcVersions = listOf( + "modern", + "legacy" +) + +/* ----------------------------------------- */ +/* CREATE SOURCE SET PER VERSION */ +/* ----------------------------------------- */ + +tasks.withType { + inputs.property("version", project.version) + + filesMatching("plugin.yml") { + expand("version" to project.version) + } +} + +mcVersions.forEach { ver -> + val ss = sourceSets.create(ver) { + java.srcDir("src/$ver/java") + + resources.setSrcDirs(listOf("src/$ver/resources", "src/main/resources")) + + compileClasspath += sourceSets["main"].output + runtimeClasspath += output + compileClasspath + } + + tasks.withType { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + configurations[ss.implementationConfigurationName] + .extendsFrom(configurations["implementation"]) + + if (ver != "legacy") { + configurations[ss.compileOnlyConfigurationName] + .extendsFrom(configurations["compileOnly"]) + } + +} + +/* ----------------------------------------- */ +/* DEPENDENCIES */ +/* ----------------------------------------- */ + +dependencies { + add("compileOnly", "io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT") + add("modernCompileOnly", "io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT") + add("legacyCompileOnly", files("libs/tenkumaLib/libs/craftbukkit-1060.jar")) + + compileOnly(project(":tenkumaLib")) + + testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") + testImplementation("org.mockito:mockito-core:5.5.0") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT") + testImplementation("com.github.seeseemelk:MockBukkit-v1.21:3.102.0") + + // Allow tests to see the versioned implementations + mcVersions.forEach { ver -> + testImplementation(sourceSets[ver].output) + } +} + +tasks.test { + useJUnitPlatform() +} + +/* ----------------------------------------- */ +/* BUILD TASKS */ +/* ----------------------------------------- */ + +mcVersions.forEach { ver -> + tasks.register("jar${ver.replace(".", "_").replace("-", "_").replace("/", "_").capitalize()}") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from(sourceSets["main"].output) + from(sourceSets[ver].output) + archiveClassifier.set(ver) + + manifest { + attributes( + "TKeeper-Impl-Version" to ver, + "TKeeper-Environment" to (System.getenv("TKEEPER_BUILD_CHANNEL") ?: "dev") + ) + } + + } +} + +tasks.register("buildAll") { + dependsOn(tasks.withType()) +} + +tasks.register("bundleAll") { + dependsOn(configurations.runtimeClasspath) + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + from(sourceSets["main"].output) + + mcVersions.forEach { ver -> + from(sourceSets[ver].output) + } + + from({ + configurations.runtimeClasspath.get() + .filter { it.name.endsWith("jar") } + .map { zipTree(it) } + }) + + archiveClassifier.set("all-implementations") + archiveVersion.set(project.version.toString()) +} + +/* ----------------------------------------- */ +/* JAVA SETTINGS */ +/* ----------------------------------------- */ + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) +} + +tasks.jar { + enabled = false +} + +tasks.withType { + options.encoding = "UTF-8" +} + +tasks.runServer { + minecraftVersion("1.21") + + val bundleAll = tasks.named("bundleAll") + val tLibBundleAll = project(":tenkumaLib").tasks.named("bundleAll") + + dependsOn(bundleAll) + dependsOn(tLibBundleAll) + + pluginJars( + bundleAll.flatMap { it.archiveFile }, + tLibBundleAll.flatMap { it.archiveFile } + ) +} \ No newline at end of file diff --git a/config.yml b/config.yml deleted file mode 100755 index 82b1a32..0000000 --- a/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -ticksBetweenUpdate: 20 -timezone: "America/Sao_Paulo" # comment this line to use system's default timezone -worlds: - - "world" \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..61285a6 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..19a6bde --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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. +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=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=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + 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 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/tenkumaLib b/libs/tenkumaLib new file mode 120000 index 0000000..32e2410 --- /dev/null +++ b/libs/tenkumaLib @@ -0,0 +1 @@ +../../tenkumaLib \ No newline at end of file diff --git a/plugin.yml b/plugin.yml deleted file mode 100755 index 88c2a42..0000000 --- a/plugin.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: tenkuma -database: false -main: gd.rf.adrianvictor.realtime.Main -name: TimeKeeper -url: https://adrianvictor.rf.gd -version: '1.0' \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..b9c753f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,2 @@ +include(":tenkumaLib") +project(":tenkumaLib").projectDir = file("libs/tenkumaLib") \ No newline at end of file diff --git a/src/gd/rf/adrianvictor/realtime/Main.java b/src/gd/rf/adrianvictor/realtime/Main.java deleted file mode 100755 index 43a654e..0000000 --- a/src/gd/rf/adrianvictor/realtime/Main.java +++ /dev/null @@ -1,51 +0,0 @@ -package gd.rf.adrianvictor.realtime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.plugin.java.JavaPlugin; -import gd.rf.adrianvictor.lib.Log; -import gd.rf.adrianvictor.lib.ConfigurationEx; - -public class Main extends JavaPlugin { - Log log; - ConfigurationEx config; - - @Override - public void onDisable() { - log.info("Disabling!"); - } - - @Override - public void onEnable() { - log = new Log(this); - log.info("Starting!"); - config = new ConfigurationEx(this, "config.yml", log); - config.loadConfig(); - int ticksBetweenUpdate = config.getInt("ticksBetweenUpdate", 20); - List worlds = config.getStringList("worlds", null); - Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable() { - @Override - public void run() { - for (String worldName : worlds) { - World world = Bukkit.getServer().getWorld(worldName); - if (world == null) { - log.severe("World " + worldName + " specified in the config was not found, removing it."); - worlds.remove(worldName); - return; - } - ZonedDateTime time = ZonedDateTime.now(ZoneId.of(config.getString("timezone", ZoneId.systemDefault().toString()))); - int hour = time.getHour(); - int minute = time.getMinute(); - long minecraftTime = (hour * 1000 + minute * 100 / 6 - 6000) % 24000; - if (minecraftTime < 0) { - minecraftTime = minecraftTime * 2; - } - world.setTime(minecraftTime); - } - } - }, 0L, ticksBetweenUpdate); - } -} diff --git a/src/legacy/java/org/adrianvictor/realtime/impl/legacy/Glimmer.java b/src/legacy/java/org/adrianvictor/realtime/impl/legacy/Glimmer.java new file mode 100644 index 0000000..2e7b408 --- /dev/null +++ b/src/legacy/java/org/adrianvictor/realtime/impl/legacy/Glimmer.java @@ -0,0 +1,12 @@ +package org.adrianvictor.realtime.impl.legacy; + +import org.adrianvictor.realtime.Main; +import org.bukkit.Bukkit; +import org.bukkit.event.Event; + +public class Glimmer implements org.adrianvictor.realtime.reflection.Glimmer { + @Override + public void onStart() { + Bukkit.getServer().getPluginManager().registerEvent(Event.Type.PLAYER_BED_ENTER, new PlayerListener(), Event.Priority.Highest, Main.getInstance()); + } +} diff --git a/src/legacy/java/org/adrianvictor/realtime/impl/legacy/PlayerListener.java b/src/legacy/java/org/adrianvictor/realtime/impl/legacy/PlayerListener.java new file mode 100644 index 0000000..7e7f5ac --- /dev/null +++ b/src/legacy/java/org/adrianvictor/realtime/impl/legacy/PlayerListener.java @@ -0,0 +1,11 @@ +package org.adrianvictor.realtime.impl.legacy; + +import org.adrianvictor.realtime.Events; +import org.bukkit.event.player.PlayerBedEnterEvent; + +public class PlayerListener extends org.bukkit.event.player.PlayerListener { + @Override + public void onPlayerBedEnter(PlayerBedEnterEvent event) { + Events.onBedEnter(event); + } +} diff --git a/src/main/java/org/adrianvictor/realtime/Events.java b/src/main/java/org/adrianvictor/realtime/Events.java new file mode 100644 index 0000000..3c26358 --- /dev/null +++ b/src/main/java/org/adrianvictor/realtime/Events.java @@ -0,0 +1,10 @@ +package org.adrianvictor.realtime; + +import org.bukkit.event.player.PlayerBedEnterEvent; + +public class Events { + public static void onBedEnter(PlayerBedEnterEvent event) { + boolean isCancelled = Main.getInstance().getConfig().getBoolean("preventSleep", true); + event.setCancelled(isCancelled); + } +} diff --git a/src/main/java/org/adrianvictor/realtime/Main.java b/src/main/java/org/adrianvictor/realtime/Main.java new file mode 100644 index 0000000..42419c7 --- /dev/null +++ b/src/main/java/org/adrianvictor/realtime/Main.java @@ -0,0 +1,51 @@ +package org.adrianvictor.realtime; +import java.io.File; +import java.io.IOException; +import java.time.ZoneId; +import java.util.List; + +import org.adrianvictor.lib.configuration.Configuration; +import org.adrianvictor.lib.configuration.exception.InvalidConfigurationException; +import org.adrianvictor.lib.configuration.provider.ConfigurationProvider; +import org.adrianvictor.realtime.reflection.VersionMatcher; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; + +public class Main extends JavaPlugin { + ConfigurationProvider config; + static JavaPlugin plugin; + + @Override + public void onEnable() { + saveResource("config.yml", false); + plugin = this; + config = Configuration.create(org.adrianvictor.lib.Main.getVersionedServiceFactory()); + + try { + config.load(new File(getDataFolder(), "config.yml")); + } catch (IOException | InvalidConfigurationException e) { + throw new RuntimeException(e); + } + + new VersionMatcher().loadGlim().onStart(); + + int ticksBetweenUpdate = config.getInt("ticksBetweenUpdate", 20); + List worlds = config.getStringList("worlds", null); + ZoneId zone = ZoneId.of(config.getString("timezone", ZoneId.systemDefault().toString())); + + Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask( + this, + new Runnable(worlds, zone), + 0L, + ticksBetweenUpdate + ); + } + + public static JavaPlugin getInstance() { + return plugin; + } + + public ConfigurationProvider getConfigProvider() { + return config; + } +} diff --git a/src/main/java/org/adrianvictor/realtime/Runnable.java b/src/main/java/org/adrianvictor/realtime/Runnable.java new file mode 100644 index 0000000..d48e911 --- /dev/null +++ b/src/main/java/org/adrianvictor/realtime/Runnable.java @@ -0,0 +1,38 @@ +package org.adrianvictor.realtime; + +import org.bukkit.Bukkit; +import org.bukkit.World; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; + +public class Runnable implements java.lang.Runnable { + List worlds; + ZoneId zone; + + public Runnable(List worlds, ZoneId zone) { + this.worlds = worlds; + this.zone = zone; + } + + @Override + public void run() { + for (String worldName : worlds) { + World world = Bukkit.getServer().getWorld(worldName); + if (world == null) { + // log.severe("World " + worldName + " specified in the config was not found, removing it."); + worlds.remove(worldName); + return; + } + ZonedDateTime time = ZonedDateTime.now(zone); + int hour = time.getHour(); + int minute = time.getMinute(); + long minecraftTime = (hour * 1000 + minute * 100 / 6 - 6000) % 24000; + if (minecraftTime < 0) { + minecraftTime = minecraftTime * 2; + } + world.setTime(minecraftTime); + } + } +} diff --git a/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java b/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java new file mode 100644 index 0000000..80feb17 --- /dev/null +++ b/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java @@ -0,0 +1,5 @@ +package org.adrianvictor.realtime.reflection; + +public interface Glimmer { + void onStart(); +} diff --git a/src/main/java/org/adrianvictor/realtime/reflection/VersionMatcher.java b/src/main/java/org/adrianvictor/realtime/reflection/VersionMatcher.java new file mode 100644 index 0000000..3412ac2 --- /dev/null +++ b/src/main/java/org/adrianvictor/realtime/reflection/VersionMatcher.java @@ -0,0 +1,202 @@ +package org.adrianvictor.realtime.reflection; + +import org.bukkit.Bukkit; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +public class VersionMatcher { + + public VersionMatcher() {} + + private record Entry(String pattern, String classSuffix) {} + + public String getVersion(String type, String serverVersion) { + if (type == null || serverVersion == null) { + return ""; + } + + Map> map = populateMap(); + List entries = map.get(type.toLowerCase()); + if (entries == null || entries.isEmpty()) { + return ""; + } + + for (Entry e : entries) { + if (safeMatches(e.pattern, serverVersion)) { + return e.pattern + "|" + e.classSuffix; + } + } + + List sorted = new ArrayList<>(entries); + Collections.sort(sorted, (a, b) -> compareVersions(a.pattern, b.pattern)); + + Entry oldest = sorted.get(0); + Entry newest = sorted.get(sorted.size() - 1); + + int cmpOldest = compareVersions(serverVersion, oldest.pattern); + int cmpNewest = compareVersions(serverVersion, newest.pattern); + + if (cmpOldest < 0) { + return oldest.pattern + "|" + oldest.classSuffix; + } else if (cmpNewest > 0) { + return newest.pattern + "|" + newest.classSuffix; + } + + // should not happen because we already tried all patterns + return newest.pattern + "|" + newest.classSuffix; + } + + private Map> populateMap() { + Map> map = new HashMap<>(); + + // RELEASE patterns, newest first (order does not matter for matching) + map.put("release", List.of( + new Entry("^1\\.21\\..*$", "r1_21") + )); + + // BETA patterns + map.put("beta", List.of( + new Entry("^1\\.7\\.3$", "b1_7_3") + )); + + return map; + } + + private int compareVersions(String v1, String v2) { + String clean1 = v1.replaceAll("[^0-9.]", ""); + String clean2 = v2.replaceAll("[^0-9.]", ""); + + String[] a1 = clean1.split("\\."); + String[] a2 = clean2.split("\\."); + + int len = Math.max(a1.length, a2.length); + for (int i = 0; i < len; i++) { + int n1 = i < a1.length ? parseInt(a1[i]) : 0; + int n2 = i < a2.length ? parseInt(a2[i]) : 0; + if (n1 != n2) { + return n1 - n2; + } + } + return 0; + } + + private int parseInt(String s) { + try { + return Integer.parseInt(s); + } catch (NumberFormatException e) { + return 0; + } + } + + public Glimmer loadGlim() { + String rawVersion = null; + try { + if (Bukkit.getServer() != null) { + rawVersion = Bukkit.getMinecraftVersion(); + } + } catch (NoSuchMethodError ignored) {} + + if (rawVersion == null || rawVersion.isEmpty()) { + try { + if (Bukkit.getServer() != null) { + String v = Bukkit.getVersion(); // e.g. "git-Bukkit-0.0.0-1060-... (MC: 1.7.3)" + int start = v.lastIndexOf("MC: "); + if (start != -1) { + rawVersion = v.substring(start + 4, v.length() - 1); + } + } + } catch (Exception ignored) {} + + if (rawVersion == null || rawVersion.isEmpty()) { + rawVersion = "unknown"; + } + } + + String matchInfo = getVersion("release", rawVersion); + if (matchInfo.isEmpty()) { + matchInfo = getVersion("beta", rawVersion); + } + + if (matchInfo.isEmpty()) { + // Fallback to b1.7.3 if everything fails, or throw error? + Glimmer fallback = tryInstantiate("org.adrianvictor.realtime.impl.b1_7_3"); + if (fallback != null) return fallback; + throw new IllegalStateException("No suitable implementation found for version " + rawVersion); + } + + String[] partsInfo = matchInfo.split("\\|"); + String classSuffix = partsInfo[1]; + + Glimmer glimmer = tryInstantiate("org.adrianvictor.realtime.impl." + classSuffix); + if (glimmer != null) return glimmer; + + // Backward search for older implementations + String[] versionParts = rawVersion.split("\\."); + int major = parseInt(versionParts[0]); + int minor = versionParts.length > 1 ? parseInt(versionParts[1]) : 0; + int patch = versionParts.length > 2 ? parseInt(versionParts[2]) : 0; + + while (major >= 0) { + while (minor >= 0) { + while (patch >= 0) { + String className = String.format("org.adrianvictor.realtime.impl.r%d_%d_%d", major, minor, patch); + glimmer = tryInstantiate(className); + if (glimmer != null) return glimmer; + + className = String.format("org.adrianvictor.realtime.impl.r%d_%d", major, minor); + glimmer = tryInstantiate(className); + if (glimmer != null) return glimmer; + + patch--; + } + minor--; + patch = 20; // Search up to .20 patch of previous minor + } + major--; + minor = 30; // Search up to .30 minor of previous major + } + + if (isNewEventSystem()) { + Glimmer modern = tryInstantiate("org.adrianvictor.realtime.impl.modern.Glimmer"); + if (modern != null) return modern; + } else { + Glimmer legacy = tryInstantiate("org.adrianvictor.realtime.impl.legacy.Glimmer"); + if (legacy != null) return legacy; + } + + throw new IllegalStateException("No suitable implementation found for version " + rawVersion); + } + + private boolean isNewEventSystem() { + try { + Class.forName("org.bukkit.event.EventHandler"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + + private Glimmer tryInstantiate(String className) { + try { + Class clazz = Class.forName(className, true, getClass().getClassLoader()); + if (!Glimmer.class.isAssignableFrom(clazz)) { + return null; + } + return (Glimmer) clazz.getDeclaredConstructor().newInstance(); + } catch (ReflectiveOperationException ignored) { + return null; + } + } + + public static boolean safeMatches(String expression, String against) { + String cleanPattern = expression.trim(); + Pattern pattern = Pattern.compile(cleanPattern, Pattern.CASE_INSENSITIVE); + return pattern.matcher(against).matches(); + } + +} \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..c736a8c --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,5 @@ +ticksBetweenUpdate: 0 # 20 ticks is 1 second +timezone: "America/Sao_Paulo" # comment this line to use system's default timezone +preventSleep: true # Players will sleep and time will sync afterwards, so it's better to disable unless you have a reason to +worlds: + - "world" \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..8584a12 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,8 @@ +author: tenkuma +database: false +main: org.adrianvictor.realtime.Main +name: TimeKeeper +depend: [tenkumaLib] +url: https://adrianvictor.rf.gd +version: '1.0' +api-version: "1.13" \ No newline at end of file diff --git a/src/modern/java/org/adrianvictor/realtime/impl/modern/EventListener.java b/src/modern/java/org/adrianvictor/realtime/impl/modern/EventListener.java new file mode 100644 index 0000000..5bfa5ca --- /dev/null +++ b/src/modern/java/org/adrianvictor/realtime/impl/modern/EventListener.java @@ -0,0 +1,13 @@ +package org.adrianvictor.realtime.impl.modern; + +import org.adrianvictor.realtime.Events; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerBedEnterEvent; + +public class EventListener implements Listener { + @EventHandler + public void onPlayerBedEnter(PlayerBedEnterEvent event) { + Events.onBedEnter(event); + } +} diff --git a/src/modern/java/org/adrianvictor/realtime/impl/modern/Glimmer.java b/src/modern/java/org/adrianvictor/realtime/impl/modern/Glimmer.java new file mode 100644 index 0000000..d544d94 --- /dev/null +++ b/src/modern/java/org/adrianvictor/realtime/impl/modern/Glimmer.java @@ -0,0 +1,11 @@ +package org.adrianvictor.realtime.impl.modern; + +import org.adrianvictor.realtime.Main; +import org.bukkit.Bukkit; + +public class Glimmer implements org.adrianvictor.realtime.reflection.Glimmer { + @Override + public void onStart() { + Bukkit.getServer().getPluginManager().registerEvents(new EventListener(), Main.getInstance()); + } +}