diff --git a/build.gradle b/build.gradle index 63343e0..16cb9c2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6.+' + id 'fabric-loom' version '1.7.+' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 4eef35e..1757def 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,5 +11,5 @@ maven_group=us.potatoboy archives_base_name=htm # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.100.1+1.21 +fabric_version=0.105.3+1.21.2 translation_version=2.3.1+1.21-pre2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..e644113 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 48c0a02..09523c0 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-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..1aa94a4 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. @@ -32,10 +32,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 +55,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/subprojects/plugins/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 +80,11 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,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 +198,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 +214,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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,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 +41,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 +57,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,13 +76,15 @@ 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 diff --git a/src/main/java/com/github/fabricservertools/htm/events/EnderDragonBreakBlockCallback.java b/src/main/java/com/github/fabricservertools/htm/events/EnderDragonBreakBlockCallback.java index fdef994..9340a9f 100644 --- a/src/main/java/com/github/fabricservertools/htm/events/EnderDragonBreakBlockCallback.java +++ b/src/main/java/com/github/fabricservertools/htm/events/EnderDragonBreakBlockCallback.java @@ -2,9 +2,9 @@ import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public interface EnderDragonBreakBlockCallback { Event EVENT = EventFactory.createArrayBacked(EnderDragonBreakBlockCallback.class, @@ -20,5 +20,5 @@ public interface EnderDragonBreakBlockCallback { return ActionResult.PASS; }); - ActionResult blockBreak(World world, BlockPos pos, boolean move); + ActionResult blockBreak(ServerWorld world, BlockPos pos, boolean move); } diff --git a/src/main/java/com/github/fabricservertools/htm/listeners/WorldEventListener.java b/src/main/java/com/github/fabricservertools/htm/listeners/WorldEventListener.java index db6ca07..74b8cc0 100644 --- a/src/main/java/com/github/fabricservertools/htm/listeners/WorldEventListener.java +++ b/src/main/java/com/github/fabricservertools/htm/listeners/WorldEventListener.java @@ -25,9 +25,7 @@ public static void init() { EnderDragonBreakBlockCallback.EVENT.register(WorldEventListener::enderDragonBreakBlock); } - private static ActionResult enderDragonBreakBlock(World world, BlockPos pos, boolean b) { - if (world.isClient) return ActionResult.PASS; - + private static ActionResult enderDragonBreakBlock(ServerWorld world, BlockPos pos, boolean b) { BlockState state = world.getBlockState(pos); if (!state.hasBlockEntity()) return ActionResult.PASS; @@ -36,7 +34,7 @@ private static ActionResult enderDragonBreakBlock(World world, BlockPos pos, boo if (blockEntity instanceof LockableObject) { //noinspection ConstantConditions - if (InteractionManager.getLock((ServerWorld) world, pos).isLocked()) return ActionResult.FAIL; + if (InteractionManager.getLock(world, pos).isLocked()) return ActionResult.FAIL; } return ActionResult.PASS; diff --git a/src/main/java/com/github/fabricservertools/htm/mixin/events/BlockItemMixin.java b/src/main/java/com/github/fabricservertools/htm/mixin/events/BlockItemMixin.java index c5fc02c..813d0f0 100644 --- a/src/main/java/com/github/fabricservertools/htm/mixin/events/BlockItemMixin.java +++ b/src/main/java/com/github/fabricservertools/htm/mixin/events/BlockItemMixin.java @@ -27,13 +27,13 @@ public BlockItemMixin(Settings settings) { method = "place(Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/util/ActionResult;", cancellable = true ) - public void HTMPlaceEventTrigger(ItemPlacementContext context, CallbackInfoReturnable info) { + public void HTMPlaceEventTrigger(ItemPlacementContext context, CallbackInfoReturnable info) { if (context.getPlayer() == null) return; ActionResult result = PlayerPlaceBlockCallback.EVENT.invoker().place(context.getPlayer(), context); if (result != ActionResult.PASS) { - info.cancel(); + info.setReturnValue(ActionResult.FAIL); } } } \ No newline at end of file diff --git a/src/main/java/com/github/fabricservertools/htm/mixin/events/EnderDragonEntityMixin.java b/src/main/java/com/github/fabricservertools/htm/mixin/events/EnderDragonEntityMixin.java index ac08962..9a5415d 100644 --- a/src/main/java/com/github/fabricservertools/htm/mixin/events/EnderDragonEntityMixin.java +++ b/src/main/java/com/github/fabricservertools/htm/mixin/events/EnderDragonEntityMixin.java @@ -1,24 +1,23 @@ package com.github.fabricservertools.htm.mixin.events; import com.github.fabricservertools.htm.events.EnderDragonBreakBlockCallback; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.entity.boss.dragon.EnderDragonEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(EnderDragonEntity.class) public abstract class EnderDragonEntityMixin { - @Redirect(method = "destroyBlocks", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;removeBlock(Lnet/minecraft/util/math/BlockPos;Z)Z")) - private boolean mobTick(World world, BlockPos pos, boolean move) { - ActionResult result = EnderDragonBreakBlockCallback.EVENT.invoker().blockBreak(world, pos, move); - if (result != ActionResult.PASS) { + @WrapOperation(method = "destroyBlocks", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;removeBlock(Lnet/minecraft/util/math/BlockPos;Z)Z")) + public boolean checkEvent(ServerWorld world, BlockPos blockPos, boolean move, Operation original) { + if (EnderDragonBreakBlockCallback.EVENT.invoker().blockBreak(world, blockPos, move) != ActionResult.PASS) { return false; } - - return world.removeBlock(pos, move); + return original.call(world, blockPos, move); } }