diff --git a/.classpath b/.classpath new file mode 100755 index 0000000..a20094d --- /dev/null +++ b/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 567d4e9..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.bat text eol=crlf -gradlew text eol=lf diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6c0a1cf..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -bin/ -libs/ -.idea/ -.gradle/ -build/ -out/ - -# Ignore Gradle project-specific cache directory -.gradle - -# Ignore Gradle build output directory -build - -run/ -runBeta/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3bc932d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[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 deleted file mode 100644 index b1f0454..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -run/ -.gradle \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b86273d..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ccbebcb..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 703388f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 04be522..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 90d9e69..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/TimeKeeper.main.iml b/.idea/modules/TimeKeeper.main.iml deleted file mode 100644 index a8ac93b..0000000 --- a/.idea/modules/TimeKeeper.main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - PAPER - ADVENTURE - - 1 - - - - - - \ No newline at end of file diff --git a/.idea/modules/TimeKeeper.test.iml b/.idea/modules/TimeKeeper.test.iml deleted file mode 100644 index 9376acd..0000000 --- a/.idea/modules/TimeKeeper.test.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - 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 deleted file mode 100644 index 9376acd..0000000 --- a/.idea/modules/libs/tenkumaLib/TimeKeeper.tenkumaLib.main.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - PAPER - ADVENTURE - - 1 - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 441ec02..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.project b/.project new file mode 100755 index 0000000..9296415 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + 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 99f26c0..4824b80 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 773760f..f1d5502 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 7812be7..aa534c2 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ This is a plugin for Minecraft beta that syncs the real world time with your in-game time. ## How it works -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. +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. -## 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 +## Performance +I am not sure if this plugin has any significant performance hit, it runs code every few ticks (you can in/decrease the frequency in the config) and that is not the best approach for doing this, but it's the only that works in beta. Using it with `ticksBetweenUpdate: 1` does not seem to change the performance in any way. The specifications for the computer used for the tests: + +`Host: 83AF IdeaPad 1 14IAU7` +`CPU: 12th Gen Intel i5-1235U (12) @ 1.300GHz` +`GPU: Intel Alder Lake-UP3 GT2 [Iris Xe Graphics]` +`Memory: 10097MiB / 15709MiB` diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 8a100b2..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,184 +0,0 @@ -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/") - maven("https://repository.johnymuffin.com/repository/maven-releases/") - 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("legacyImplementation", "com.legacyminecraft.poseidon:poseidon-craftbukkit:1.1.12-260503-0121-a9af58a") - - 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") - - 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 modern = tasks.named("jarModern") - val tLibBundleAll = project(":tenkumaLib").tasks.named("bundleAll") - - dependsOn(modern) - dependsOn(tLibBundleAll) - - pluginJars( - modern.flatMap { it.archiveFile }, - tLibBundleAll.flatMap { it.archiveFile } - ) -} - -tasks.register("copyLegacyPlugin") { - from(project(":tenkumaLib").tasks.named("bundleAll")) - from(tasks.named("jarLegacy")) - into("runBeta/plugins") -} - -tasks.register("runBetaServer") { - group = "verification" - description = "Runs the beta server with legacy TimeKeeper." - - dependsOn("copyLegacyPlugin") - - jvmArgs = listOf("-Djline.terminal=jline.UnsupportedTerminal", "-Dfile.encoding=UTF-8", "-Djava.awt.headless=true") - classpath = files("runBeta/poseidon-craftbukkit.jar") - mainClass.set("org.bukkit.craftbukkit.Main") - workingDir = file("runBeta") - - standardInput = file("/dev/null").inputStream() -} \ No newline at end of file diff --git a/config.yml b/config.yml new file mode 100755 index 0000000..82b1a32 --- /dev/null +++ b/config.yml @@ -0,0 +1,4 @@ +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 deleted file mode 100644 index 61285a6..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 19a6bde..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100755 index adff685..0000000 --- a/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/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 deleted file mode 100644 index c4bdd3a..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,93 +0,0 @@ -@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 deleted file mode 120000 index 32e2410..0000000 --- a/libs/tenkumaLib +++ /dev/null @@ -1 +0,0 @@ -../../tenkumaLib \ No newline at end of file diff --git a/plugin.yml b/plugin.yml new file mode 100755 index 0000000..88c2a42 --- /dev/null +++ b/plugin.yml @@ -0,0 +1,6 @@ +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 deleted file mode 100644 index b9c753f..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,2 +0,0 @@ -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 new file mode 100755 index 0000000..43a654e --- /dev/null +++ b/src/gd/rf/adrianvictor/realtime/Main.java @@ -0,0 +1,51 @@ +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 deleted file mode 100644 index 2e7b408..0000000 --- a/src/legacy/java/org/adrianvictor/realtime/impl/legacy/Glimmer.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 7e7f5ac..0000000 --- a/src/legacy/java/org/adrianvictor/realtime/impl/legacy/PlayerListener.java +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index f97a206..0000000 --- a/src/main/java/org/adrianvictor/realtime/Events.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.adrianvictor.realtime; - -import org.bukkit.event.player.PlayerBedEnterEvent; - -public class Events { - public static void onBedEnter(PlayerBedEnterEvent event) { - boolean isCancelled = Main.getInstance().getConfigProvider().getBoolean("preventSleep", true); - event.setCancelled(isCancelled); - } -} diff --git a/src/main/java/org/adrianvictor/realtime/GlimmerFactory.java b/src/main/java/org/adrianvictor/realtime/GlimmerFactory.java deleted file mode 100644 index 915b971..0000000 --- a/src/main/java/org/adrianvictor/realtime/GlimmerFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.adrianvictor.realtime; - -import org.adrianvictor.realtime.reflection.Glimmer; - -public class GlimmerFactory { - public static Glimmer create() { - try { - return (Glimmer) Class.forName("org.adrianvictor.realtime.impl.modern.Glimmer") - .getDeclaredConstructor().newInstance(); - } catch (Exception e) { - try { - return (Glimmer) Class.forName("org.adrianvictor.realtime.impl.legacy.Glimmer") - .getDeclaredConstructor().newInstance(); - } catch (Exception ex) { - throw new RuntimeException("Failed to instantiate Glimmer implementation", ex); - } - } - } -} diff --git a/src/main/java/org/adrianvictor/realtime/Main.java b/src/main/java/org/adrianvictor/realtime/Main.java deleted file mode 100644 index b77ef01..0000000 --- a/src/main/java/org/adrianvictor/realtime/Main.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.adrianvictor.realtime; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.ZoneId; -import java.util.List; - -import org.adrianvictor.lib.configuration.exception.InvalidConfigurationException; -import org.adrianvictor.lib.configuration.provider.ConfigurationProvider; -import org.adrianvictor.lib.file.provider.FileProvider; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -public class Main extends JavaPlugin { - ConfigurationProvider config; - static Main plugin; - - @Override - public void onEnable() { - try { - FileProvider.get().saveResource("config.yml", false, this); - } catch (IOException e) { - throw new RuntimeException(e); - } - - plugin = this; - config = ConfigurationProvider.get(); - - try { - File configFile = new File(getDataFolder(), "config.yml"); - String configString = Files.readString(Path.of(configFile.getPath())); - config.load(configString); - } catch (IOException | InvalidConfigurationException e) { - throw new RuntimeException(e); - } - - GlimmerFactory.create().onStart(); - - int ticksBetweenUpdate = config.getInt("ticksBetweenUpdate", 20); - List worlds = config.getStringList("worlds", List.of("world")); - ZoneId zone = ZoneId.of(config.getString("timezone", ZoneId.systemDefault().toString())); - - Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask( - this, - new Runnable(worlds, zone), - 0L, - ticksBetweenUpdate - ); - } - - public static Main 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 deleted file mode 100644 index 38968a5..0000000 --- a/src/main/java/org/adrianvictor/realtime/Runnable.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.adrianvictor.realtime; - -import org.adrianvictor.lib.logging.provider.LoggerProvider; -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) { - LoggerProvider.get().info("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(); - - // Minecraft time: 0 is 6:00 AM. 18000 is Midnight (0:00). - // (hour * 1000) + (minute * 1000 / 60) gives time in ticks from 0:00. - // Subtract 6000 to align 6:00 AM with 0 ticks. - long ticksSinceMidnight = (hour * 1000L) + (minute * 1000L / 60L); - long minecraftTime = (ticksSinceMidnight - 6000L + 24000L) % 24000L; - - long currentFullTime = world.getFullTime(); - long day = currentFullTime / 24000L; - world.setFullTime(day * 24000L + minecraftTime); - } - } -} diff --git a/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java b/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java deleted file mode 100644 index 80feb17..0000000 --- a/src/main/java/org/adrianvictor/realtime/reflection/Glimmer.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.adrianvictor.realtime.reflection; - -public interface Glimmer { - void onStart(); -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml deleted file mode 100644 index d2c4221..0000000 --- a/src/main/resources/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -ticksBetweenUpdate: 1 # 20 ticks is 1 second, 0 lags the server -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 deleted file mode 100644 index 5902aff..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: tenkuma -database: false -main: org.adrianvictor.realtime.Main -name: TimeKeeper -depend: [tenkumaLib] -url: https://adrianvictor.rf.gd -version: '2.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 deleted file mode 100644 index 5bfa5ca..0000000 --- a/src/modern/java/org/adrianvictor/realtime/impl/modern/EventListener.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index d544d94..0000000 --- a/src/modern/java/org/adrianvictor/realtime/impl/modern/Glimmer.java +++ /dev/null @@ -1,11 +0,0 @@ -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()); - } -}