diff --git a/build.gradle b/build.gradle index eb087e7..e07f299 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -64,6 +64,7 @@ publishing { artifact(remapJar) { builtBy remapJar } + artifact(sourcesJar) { builtBy remapSourcesJar } diff --git a/gradle.properties b/gradle.properties index 97c84b4..b5456e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.20 - yarn_mappings=1.20+build.1 - loader_version=0.14.21 + minecraft_version=1.20.5 + yarn_mappings=1.20.5+build.1 + loader_version=0.15.10 # Mod Properties - mod_version = 1.3.1 + mod_version = 1.3.2 maven_group = eu.midnightdust archives_base_name = swordblocking # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.83.0+1.20 - midnightlib_version=1.4.1-fabric + fabric_version=0.97.6+1.20.5 + midnightlib_version=1.5.4-fabric diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..d64cd49 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 59bc51a..a80b22c 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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -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" \ diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ 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% @@ -42,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 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 diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java index d4cb2f3..4e733ae 100644 --- a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java +++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java @@ -12,24 +12,26 @@ import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; public class SwordBlockingClient implements ClientModInitializer { - @Override public void onInitializeClient() { SwordBlockingConfig.init("swordblocking", SwordBlockingConfig.class); + for (Item item : Registries.ITEM) { - if (item instanceof SwordItem || item instanceof AxeItem) { - ModelPredicateProviderRegistry.register(item, new Identifier("blocking"), - (stack, world, entity, seed) -> - entity != null && isWeaponBlocking(entity) ? 1.0F : 0.0F); - } + if (!(item instanceof SwordItem || item instanceof AxeItem)) + continue; + ModelPredicateProviderRegistry.register(item, new Identifier("blocking"), + (stack, world, entity, seed) -> entity != null && isWeaponBlocking(entity) ? 1.0F : 0.0F); } + FabricLoader.getInstance().getModContainer("swordblocking").ifPresent(modContainer -> { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("swordblocking", "blocking_predicates"), modContainer, ResourcePackActivationType.ALWAYS_ENABLED); }); } + public static boolean isWeaponBlocking(LivingEntity entity) { return (entity.isUsingItem() && canWeaponBlock(entity)); } + public static boolean canWeaponBlock(LivingEntity entity) { return (SwordBlockingConfig.enabled && (entity.getMainHandStack().getItem() instanceof SwordItem || entity.getMainHandStack().getItem() instanceof AxeItem) && entity.getOffHandStack().getItem() instanceof ShieldItem) || diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java index d2eca68..7ccf061 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java @@ -15,13 +15,13 @@ public abstract class MixinBipedEntityModel { @Shadow protected abstract void positionLeftArm(T entity); - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;animateArms(Lnet/minecraft/entity/LivingEntity;F)V", - shift = At.Shift.BEFORE),method = "setAngles(Lnet/minecraft/entity/LivingEntity;FFFFF)V") + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;animateArms(Lnet/minecraft/entity/LivingEntity;F)V", shift = At.Shift.BEFORE), method = "setAngles(Lnet/minecraft/entity/LivingEntity;FFFFF)V") private void swordblocking$setBlockingAngles(T livingEntity, float f, float g, float h, float i, float j, CallbackInfo ci) { - if (SwordBlockingClient.isWeaponBlocking(livingEntity)) { - if (livingEntity.getOffHandStack().getItem() instanceof ShieldItem) - this.positionRightArm(livingEntity); - else this.positionLeftArm(livingEntity); - } + if (!SwordBlockingClient.isWeaponBlocking(livingEntity)) + return; + if (livingEntity.getOffHandStack().getItem() instanceof ShieldItem) + this.positionRightArm(livingEntity); + else + this.positionLeftArm(livingEntity); } } diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java index ebb680d..029d40b 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class MixinHeldItemRenderer { @Inject(at = @At("HEAD"), cancellable = true, method = "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V") public void swordblocking$hideShield(LivingEntity entity, ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { - if (SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) ci.cancel(); - else if (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity)) ci.cancel(); + if ((SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) || (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity))) + ci.cancel(); } } diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinInGameHud.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinInGameHud.java index 2a8b33b..c4be51f 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinInGameHud.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinInGameHud.java @@ -14,7 +14,6 @@ public abstract class MixinInGameHud { @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getOffHandStack()Lnet/minecraft/item/ItemStack;"), method = "renderHotbar") public ItemStack swordblocking$hideOffHandSlot(PlayerEntity player) { ItemStack realStack = player.getOffHandStack(); - if (SwordBlockingConfig.enabled && SwordBlockingConfig.hideOffhandSlot && realStack.getItem() instanceof ShieldItem) return ItemStack.EMPTY; - else return realStack; + return (SwordBlockingConfig.enabled && SwordBlockingConfig.hideOffhandSlot && realStack.getItem() instanceof ShieldItem) ? ItemStack.EMPTY : realStack; } } diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java index 0ecdce9..6bedb54 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java @@ -21,14 +21,15 @@ public abstract class MixinPlayerEntityRenderer { @Environment(EnvType.CLIENT) private static void swordblocking$getArmPose(AbstractClientPlayerEntity abstractClientPlayerEntity, Hand hand, CallbackInfoReturnable cir) { if (!SwordBlockingConfig.enabled) return; + ItemStack handStack = abstractClientPlayerEntity.getStackInHand(hand); ItemStack offStack = abstractClientPlayerEntity.getStackInHand(hand.equals(Hand.MAIN_HAND) ? Hand.OFF_HAND : Hand.MAIN_HAND); - if (!SwordBlockingConfig.alwaysHideShield && (handStack.getItem() instanceof ShieldItem) && !SwordBlockingClient.canWeaponBlock(abstractClientPlayerEntity)) return; + if (!SwordBlockingConfig.alwaysHideShield && (handStack.getItem() instanceof ShieldItem) && !SwordBlockingClient.canWeaponBlock(abstractClientPlayerEntity)) + return; if (offStack.getItem() instanceof ShieldItem && abstractClientPlayerEntity.isUsingItem()) { cir.setReturnValue(BipedEntityModel.ArmPose.BLOCK); - } - else if (handStack.getItem() instanceof ShieldItem && SwordBlockingConfig.hideShield) { + } else if (handStack.getItem() instanceof ShieldItem && SwordBlockingConfig.hideShield) { cir.setReturnValue(BipedEntityModel.ArmPose.EMPTY); } }