diff --git a/.github/workflows/build-on-push.yml b/.github/workflows/build-on-push.yml index 80cf8f8..0690906 100644 --- a/.github/workflows/build-on-push.yml +++ b/.github/workflows/build-on-push.yml @@ -4,15 +4,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' - - name: Gradle Build - uses: eskatos/gradle-command-action@v1 - with: - arguments: build - wrapper-cache-enabled: true - dependencies-cache-enabled: true - configuration-cache-enabled: true + java-version: '21' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Build with Gradle + run: ./gradlew build diff --git a/build.gradle b/build.gradle index 71a0302..c5e3544 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name -version = project.mod_version +version = "${project.mod_version}-mc${project.minecraft_version}" group = project.maven_group dependencies { @@ -19,10 +19,6 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } -loom { - accessWidenerPath = file("src/main/resources/ticktock.accesswidener") - } - processResources { inputs.property "version", project.version @@ -38,8 +34,8 @@ tasks.withType(JavaCompile).configureEach { // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" - // Minecraft 1.18 upwards uses Java 17. - it.options.release = 17 + // Minecraft 1.20.5 upwards uses Java 21. + it.options.release = 21 } java { diff --git a/gradle.properties b/gradle.properties index ee4f7d4..7d74b53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.18.2 -yarn_mappings=1.18.2+build.2 -loader_version=0.13.3 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 +loader_version=0.16.9 # Mod Properties mod_version=1.3.2 maven_group=me.techchrism archives_base_name=ticktock # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.48.0+1.18.2 +fabric_version=0.107.0+1.21.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..a4b76b9 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 a33384a..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cbede15..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright � 2015-2021 the original authors. +# Copyright © 2015-2021 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. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -32,10 +34,10 @@ # 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�. +# * 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: # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# 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 +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ 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. 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 @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# 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, 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" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# 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. @@ -231,4 +249,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 477c896..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @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 +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -75,15 +78,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 \ No newline at end of file +:omega diff --git a/src/main/java/me/techchrism/ticktock/Ticktock.java b/src/main/java/me/techchrism/ticktock/Ticktock.java index a4de3cc..e3eab84 100644 --- a/src/main/java/me/techchrism/ticktock/Ticktock.java +++ b/src/main/java/me/techchrism/ticktock/Ticktock.java @@ -1,25 +1,22 @@ package me.techchrism.ticktock; -import com.mojang.datafixers.util.Either; import me.techchrism.ticktock.mixin.ChunkTicketManagerInvoker; import me.techchrism.ticktock.mixin.ChunkTicketTypeAccessor; -import me.techchrism.ticktock.mixin.ThreadedAnvilChunkStorageInvoker; - -import java.util.Optional; - +import me.techchrism.ticktock.mixin.ServerChunkLoadingManagerInvoker; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.minecraft.block.BlockState; import net.minecraft.fluid.FluidState; -import net.minecraft.server.world.*; +import net.minecraft.server.world.ChunkHolder; +import net.minecraft.server.world.OptionalChunk; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.profiler.Profiler; +import net.minecraft.util.profiler.Profilers; import net.minecraft.world.GameRules; -import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.WorldChunk; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; - public class Ticktock implements ModInitializer { @Override @@ -28,10 +25,10 @@ public void onInitialize() //todo check if this should happen at the start or end of the world tick ServerTickEvents.START_WORLD_TICK.register(this::tick); } - + private void tick(ServerWorld world) { - ThreadedAnvilChunkStorageInvoker storage = (ThreadedAnvilChunkStorageInvoker) world.getChunkManager().threadedAnvilChunkStorage; + ServerChunkLoadingManagerInvoker storage = (ServerChunkLoadingManagerInvoker) world.getChunkManager().chunkLoadingManager; ChunkTicketManagerInvoker ticketManager = (ChunkTicketManagerInvoker) storage.ticktock_invokeGetTicketManager(); int randomTickSpeed = world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); if(randomTickSpeed == 0) @@ -47,45 +44,39 @@ private void tick(ServerWorld world) { return; } - - Optional optionalWorldChunk = ((Either) chunkHolder.getTickingFuture().getNow(ChunkHolder.UNLOADED_WORLD_CHUNK)).left(); - if (optionalWorldChunk.isEmpty()) - { - return; - } - // Make sure it's too far to get regular random ticks - if(!storage.ticktock_invokeShouldTick(chunkHolder.getPos())) - { - WorldChunk chunk = optionalWorldChunk.get(); - Profiler profiler = world.getProfiler(); - int startX = chunk.getPos().getStartX(); - int startZ = chunk.getPos().getStartZ(); - for(ChunkSection chunkSection : chunk.getSectionArray()) - { - if(chunkSection != null && chunkSection.hasRandomTicks()) - { - int yOffset = chunkSection.getYOffset(); - for(int m = 0; m < randomTickSpeed; m++) - { - BlockPos randomPosInChunk = world.getRandomPosInChunk(startX, yOffset, startZ, 15); - profiler.push("randomTick"); - BlockState blockState = chunkSection.getBlockState(randomPosInChunk.getX() - startX, - randomPosInChunk.getY() - yOffset, - randomPosInChunk.getZ() - startZ); - if(blockState.hasRandomTicks()) - { - blockState.randomTick(world, randomPosInChunk, world.random); - } - FluidState fluidState = blockState.getFluidState(); - if(fluidState.hasRandomTicks()) - { - fluidState.onRandomTick(world, randomPosInChunk, world.random); + + OptionalChunk optionalWorldChunk = chunkHolder.getTickingFuture().getNow(ChunkHolder.UNLOADED_WORLD_CHUNK); + optionalWorldChunk.ifPresent(chunk -> { + // Make sure it's too far to get regular random ticks + if (!storage.ticktock_invokeShouldTick(chunkHolder.getPos())) { + Profiler profiler = Profilers.get(); + int startX = chunk.getPos().getStartX(); + int startZ = chunk.getPos().getStartZ(); + int bottomY = chunk.getBottomY(); + ChunkSection[] chunkSections = chunk.getSectionArray(); + for (int i = 0; i < chunkSections.length; i++) { + ChunkSection chunkSection = chunkSections[i]; + if (chunkSection != null && chunkSection.hasRandomTicks()) { + int yOffset = bottomY + i * 16; + for (int m = 0; m < randomTickSpeed; m++) { + BlockPos randomPosInChunk = world.getRandomPosInChunk(startX, yOffset, startZ, 15); + profiler.push("randomTick"); + BlockState blockState = chunkSection.getBlockState(randomPosInChunk.getX() - startX, + randomPosInChunk.getY() - yOffset, + randomPosInChunk.getZ() - startZ); + if (blockState.hasRandomTicks()) { + blockState.randomTick(world, randomPosInChunk, world.random); + } + FluidState fluidState = blockState.getFluidState(); + if (fluidState.hasRandomTicks()) { + fluidState.onRandomTick(world, randomPosInChunk, world.random); + } + profiler.pop(); } - profiler.pop(); } } } - } + }); }); } } diff --git a/src/main/java/me/techchrism/ticktock/mixin/ThreadedAnvilChunkStorageInvoker.java b/src/main/java/me/techchrism/ticktock/mixin/ServerChunkLoadingManagerInvoker.java similarity index 78% rename from src/main/java/me/techchrism/ticktock/mixin/ThreadedAnvilChunkStorageInvoker.java rename to src/main/java/me/techchrism/ticktock/mixin/ServerChunkLoadingManagerInvoker.java index 1f175f2..b827196 100644 --- a/src/main/java/me/techchrism/ticktock/mixin/ThreadedAnvilChunkStorageInvoker.java +++ b/src/main/java/me/techchrism/ticktock/mixin/ServerChunkLoadingManagerInvoker.java @@ -1,15 +1,15 @@ package me.techchrism.ticktock.mixin; +import net.minecraft.server.world.ServerChunkLoadingManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import net.minecraft.server.world.ChunkHolder; import net.minecraft.server.world.ChunkTicketManager; -import net.minecraft.server.world.ThreadedAnvilChunkStorage; import net.minecraft.util.math.ChunkPos; -@Mixin(ThreadedAnvilChunkStorage.class) -public interface ThreadedAnvilChunkStorageInvoker +@Mixin(ServerChunkLoadingManager.class) +public interface ServerChunkLoadingManagerInvoker { @Invoker("shouldTick") boolean ticktock_invokeShouldTick(ChunkPos arg); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e367482..098366f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,10 +19,9 @@ "depends": { "fabricloader": ">=0.10.1+build.209", "fabric": "*", - "minecraft": "1.18.2" + "minecraft": ">=1.21.2" }, "mixins": [ "ticktock.mixins.json" - ], - "accessWidener": "ticktock.accesswidener" + ] } diff --git a/src/main/resources/ticktock.accesswidener b/src/main/resources/ticktock.accesswidener deleted file mode 100644 index 90a13bb..0000000 --- a/src/main/resources/ticktock.accesswidener +++ /dev/null @@ -1,3 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager \ No newline at end of file diff --git a/src/main/resources/ticktock.mixins.json b/src/main/resources/ticktock.mixins.json index 0e09638..3a042bc 100644 --- a/src/main/resources/ticktock.mixins.json +++ b/src/main/resources/ticktock.mixins.json @@ -4,9 +4,9 @@ "package": "me.techchrism.ticktock.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ThreadedAnvilChunkStorageInvoker", "ChunkTicketManagerInvoker", - "ChunkTicketTypeAccessor" + "ChunkTicketTypeAccessor", + "ServerChunkLoadingManagerInvoker" ], "client": [], "server": [],