SwordBlocking 1.2.0 - 1.19.3, Config, Axe blocking,

- Added configuration screen based on MidnightLib
- Made everything configurable
- Add option to hide offhand slot when it contains a shield
- Fix 3rd-person blocking

build.gradle

@@ -1,20 +1,17 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '1.0-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-minecraft {
-}
-
 repositories {
-	maven { url "https://jitpack.io" }
+	maven { url "https://api.modrinth.com/maven" }
 }
 
 dependencies {
@@ -22,8 +19,9 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	modImplementation "maven.modrinth:midnightlib:${midnightlib_version}"
 }
 
 processResources {
@@ -34,23 +32,27 @@ processResources {
 	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+tasks.withType(JavaCompile).configureEach {
-// this fixes some edge cases with special characters not displaying correctly
+    it.options.encoding = "UTF-8"
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    it.options.release = 17
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+java {
-// if it is present.
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// If you remove this task, sources will not be generated.
+	// if it is present.
-task sourcesJar(type: Jar, dependsOn: classes) {
+	// If you remove this line, sources will not be generated.
-	classifier = "sources"
+	withSourcesJar()
-	from sourceSets.main.allSource
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}
+
+remapJar {
+    archiveVersion = "${project.version}-${project.minecraft_version}"
+    archiveBaseName = "${project.archivesBaseName}"
 }
 
 // configure the maven publication
@@ -67,9 +69,11 @@ publishing {
 		}
 	}
 
-	// select the repositories you want to publish to
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
-		// uncomment to publish to the local maven
+		// Add repositories to publish to here.
-		// mavenLocal()
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
 	}
 }

gradle.properties

@@ -3,15 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17
+	minecraft_version=1.19.3
-	yarn_mappings=1.17+build.13
+	yarn_mappings=1.19.3+build.5
-	loader_version=0.10.8
+	loader_version=0.14.12
 
 # Mod Properties
-	mod_version = 1.1.0
+	mod_version = 1.2.0
 	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.36.1+1.17
+	fabric_version=0.72.0+1.19.3
+	midnightlib_version=1.1.0-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or 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.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   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/master/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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # 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"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,84 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=$(save "$@")
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+
-  cd "$(dirname "$0")"
+    # 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
 
+# 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.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        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.
+#
+# 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" "$@"

gradlew.bat

@@ -1,100 +1,91 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@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 not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@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 distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
+
-@rem Find java.exe
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-if defined JAVA_HOME goto findJavaFromJavaHome
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-set JAVA_EXE=java.exe
+@rem Find java.exe
-%JAVA_EXE% -version >NUL 2>&1
+if defined JAVA_HOME goto findJavaFromJavaHome
-if "%ERRORLEVEL%" == "0" goto init
+
-
+set JAVA_EXE=java.exe
-echo.
+%JAVA_EXE% -version >NUL 2>&1
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+if %ERRORLEVEL% equ 0 goto execute
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+echo.
-echo location of your Java installation.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
+echo.
-goto fail
+echo Please set the JAVA_HOME variable in your environment to match the
-
+echo location of your Java installation.
-:findJavaFromJavaHome
+
-set JAVA_HOME=%JAVA_HOME:"=%
+goto fail
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
-
+:findJavaFromJavaHome
-if exist "%JAVA_EXE%" goto init
+set JAVA_HOME=%JAVA_HOME:"=%
-
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-echo.
+
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+if exist "%JAVA_EXE%" goto execute
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+echo.
-echo location of your Java installation.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-
+echo.
-goto fail
+echo Please set the JAVA_HOME variable in your environment to match the
-
+echo location of your Java installation.
-:init
+
-@rem Get command-line arguments, handling Windows variants
+goto fail
-
+
-if not "%OS%" == "Windows_NT" goto win9xME_args
+:execute
-
+@rem Setup the command line
-:win9xME_args
+
-@rem Slurp the command line arguments.
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-set CMD_LINE_ARGS=
+
-set _SKIP=2
+
-
+@rem Execute Gradle
-:win9xME_args_slurp
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-if "x%~1" == "x" goto execute
+
-
+:end
-set CMD_LINE_ARGS=%*
+@rem End local scope for the variables with windows NT shell
-
+if %ERRORLEVEL% equ 0 goto mainEnd
-:execute
+
-@rem Setup the command line
+:fail
-
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+rem the _cmd.exe /c_ return code!
-
+set EXIT_CODE=%ERRORLEVEL%
-@rem Execute Gradle
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-
+exit /b %EXIT_CODE%
-:end
+
-@rem End local scope for the variables with windows NT shell
+:mainEnd
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if "%OS%"=="Windows_NT" endlocal
-
+
-:fail
+:omega
-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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java

@@ -1,31 +1,39 @@
 package eu.midnightdust.swordblocking;
 
+import eu.midnightdust.swordblocking.config.SwordBlockingConfig;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.minecraft.client.item.UnclampedModelPredicateProvider;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.minecraft.client.world.ClientWorld;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.item.ModelPredicateProviderRegistry;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.Item;
+import net.minecraft.item.*;
-import net.minecraft.item.ItemStack;
+import net.minecraft.registry.Registries;
-import net.minecraft.item.Items;
-import net.minecraft.item.SwordItem;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import org.jetbrains.annotations.Nullable;
 
 public class SwordBlockingClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        for (Item item : Registry.ITEM) {
+        SwordBlockingConfig.init("swordblocking", SwordBlockingConfig.class);
-            if (item instanceof SwordItem) {
+        for (Item item : Registries.ITEM) {
-                FabricModelPredicateProviderRegistry.register(item, new Identifier("blocking"), new UnclampedModelPredicateProvider() {
+            if (item instanceof SwordItem || item instanceof AxeItem) {
-                    @Override
+                ModelPredicateProviderRegistry.register(item, new Identifier("blocking"),
-                    public float unclampedCall(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity, int seed) {
+                        (stack, world, entity, seed) ->
-                        return entity != null && entity.getOffHandStack().getItem().equals(Items.SHIELD) && entity.isUsingItem() ? 1.0F : 0.0F;
+                                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) ||
+                ((entity.getOffHandStack().getItem() instanceof SwordItem || entity.getOffHandStack().getItem() instanceof AxeItem) &&
+                        entity.getMainHandStack().getItem() instanceof ShieldItem);
     }
 }

src/main/java/eu/midnightdust/swordblocking/config/SwordBlockingConfig.java

@@ -0,0 +1,10 @@
+package eu.midnightdust.swordblocking.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+public class SwordBlockingConfig extends MidnightConfig {
+    @Entry public static boolean enabled = true;
+    @Entry public static boolean hideShield = true;
+    @Entry public static boolean alwaysHideShield = true;
+    @Entry public static boolean hideOffhandSlot = false;
+}

src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java

@@ -0,0 +1,27 @@
+package eu.midnightdust.swordblocking.mixin;
+
+import eu.midnightdust.swordblocking.SwordBlockingClient;
+import net.minecraft.client.render.entity.model.BipedEntityModel;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ShieldItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BipedEntityModel.class)
+public abstract class MixinBipedEntityModel<T extends LivingEntity> {
+    @Shadow protected abstract void positionRightArm(T entity);
+
+    @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")
+    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);
+        }
+    }
+}

src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java

@@ -0,0 +1,24 @@
+package eu.midnightdust.swordblocking.mixin;
+
+import eu.midnightdust.swordblocking.SwordBlockingClient;
+import eu.midnightdust.swordblocking.config.SwordBlockingConfig;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.HeldItemRenderer;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ShieldItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(HeldItemRenderer.class)
+public abstract class MixinHeldItemRenderer {
+    @Inject(at = @At("HEAD"), cancellable = true, method = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V")
+    public void swordblocking$hideShield(LivingEntity entity, ItemStack stack, ModelTransformation.Mode 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();
+    }
+}

src/main/java/eu/midnightdust/swordblocking/mixin/MixinInGameHud.java

@@ -0,0 +1,20 @@
+package eu.midnightdust.swordblocking.mixin;
+
+import eu.midnightdust.swordblocking.config.SwordBlockingConfig;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ShieldItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(InGameHud.class)
+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;
+    }
+}

src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java

@@ -1,5 +1,7 @@
 package eu.midnightdust.swordblocking.mixin;
 
+import eu.midnightdust.swordblocking.SwordBlockingClient;
+import eu.midnightdust.swordblocking.config.SwordBlockingConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -15,17 +17,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerEntityRenderer.class)
 public abstract class MixinPlayerEntityRenderer {
-
+    @Inject(at = @At(value = "RETURN"), method = "getArmPose", cancellable = true)
-    @Inject(at = @At("HEAD"), method = "getArmPose", cancellable = true)
     @Environment(EnvType.CLIENT)
-    private static void getArmPose(AbstractClientPlayerEntity abstractClientPlayerEntity, Hand hand, CallbackInfoReturnable<BipedEntityModel.ArmPose> cir) {
+    private static void swordblocking$getArmPose(AbstractClientPlayerEntity abstractClientPlayerEntity, Hand hand, CallbackInfoReturnable<BipedEntityModel.ArmPose> cir) {
-        ItemStack itemStack = abstractClientPlayerEntity.getStackInHand(hand);
+        if (!SwordBlockingConfig.enabled) return;
-        ItemStack itemStack2 = abstractClientPlayerEntity.getOffHandStack();
+        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 (itemStack2.getItem() instanceof ShieldItem && abstractClientPlayerEntity.isUsingItem()) {
+        if (offStack.getItem() instanceof ShieldItem && abstractClientPlayerEntity.isUsingItem()) {
             cir.setReturnValue(BipedEntityModel.ArmPose.BLOCK);
         }
-        if (itemStack.getItem() instanceof ShieldItem) {
+        else if (handStack.getItem() instanceof ShieldItem && SwordBlockingConfig.hideShield) {
             cir.setReturnValue(BipedEntityModel.ArmPose.EMPTY);
         }
     }

src/main/resources/assets/minecraft/models/item/shield.json

@@ -1,52 +0,0 @@
-{
-    "parent": "builtin/entity",
-    "gui_light": "front",
-    "textures": {
-        "particle": "block/dark_oak_planks"
-    },
-    "display": {
-        "thirdperson_righthand": {
-            "rotation": [ 0, 90, 0 ],
-            "translation": [ 10, 6, -4 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "thirdperson_lefthand": {
-            "rotation": [ 0, 90, 0 ],
-            "translation": [ 10, 6, 12 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "firstperson_righthand": {
-            "rotation": [ 0, 180, 5 ],
-            "translation": [ -10, 2, -10 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "firstperson_lefthand": {
-            "rotation": [ 0, 180, 5 ],
-            "translation": [ 10, 0, -10 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "gui": {
-            "rotation": [ 15, -25, -5 ],
-            "translation": [ 2, 3, 0 ],
-            "scale": [ 0.65, 0.65, 0.65 ]
-        },
-        "fixed": {
-            "rotation": [ 0, 180, 0 ],
-            "translation": [ -2, 4, -5],
-            "scale":[ 0.5, 0.5, 0.5]
-        },
-        "ground": {
-            "rotation": [ 0, 0, 0 ],
-            "translation": [ 4, 4, 2],
-            "scale":[ 0.25, 0.25, 0.25]
-        }
-    },
-    "overrides": [
-        {
-            "predicate": {
-                "blocking": 1
-            },
-            "model": "item/shield_blocking"
-        }
-    ]
-}

src/main/resources/assets/minecraft/models/item/shield_blocking.json

@@ -1,34 +0,0 @@
-{
-    "parent": "builtin/entity",
-    "gui_light": "front",
-    "textures": {
-        "particle": "block/dark_oak_planks"
-    },
-    "display": {
-        "thirdperson_righthand": {
-            "rotation": [ 45, 135, 0 ],
-            "translation": [ 3.51, 11, -2 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "thirdperson_lefthand": {
-            "rotation": [ 45, 135, 0 ],
-            "translation": [ 13.51, 3, 5 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "firstperson_righthand": {
-            "rotation": [ 0, 180, -5 ],
-            "translation": [ -15, 5, -11 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "firstperson_lefthand": {
-            "rotation": [ 0, 180, -5 ],
-            "translation": [ 5, 5, -11 ],
-            "scale": [ 0, 0, 0 ]
-        },
-        "gui": {
-            "rotation": [ 15, -25, -5 ],
-            "translation": [ 2, 3, 0 ],
-            "scale": [ 0.65, 0.65, 0.65 ]
-        }
-    }
-}

src/main/resources/assets/swordblocking/lang/en_us.json

@@ -0,0 +1,8 @@
+{
+  "swordblocking.midnightconfig.title": "Sword Blocking Config",
+  "swordblocking.midnightconfig.enabled": "Enabled",
+  "swordblocking.midnightconfig.hideShield": "Hide Shield",
+  "swordblocking.midnightconfig.alwaysHideShield": "Always Hide Shield",
+  "swordblocking.midnightconfig.hideOffhandSlot": "Hide Offhand Slot",
+  "swordblocking.midnightconfig.hideOffhandSlot.tooltip": "Hides the offhand slot when a shield is in the offhand."
+}

src/main/resources/fabric.mod.json

@@ -4,7 +4,7 @@
   "version": "${version}",
 
   "name": "Sword Blocking",
-  "description": "Adds sword blocking back to 1.16, you just need a shield in your offhand!",
+  "description": "Adds sword blocking to new versions, you just need a shield in your offhand!",
   "authors": [
     "Motschen",
     "TeamMidnightDust"
@@ -30,6 +30,7 @@
   ],
 
   "depends": {
-    "fabric": "*"
+    "fabric": "*",
+    "midnightlib": "*"
   }
 }

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/diamond_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/diamond_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/handheld_blocking",
+	"textures": {
+		"layer0": "minecraft:item/diamond_axe"
+	}
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/golden_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/golden_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/golden_axe"
+  }
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/iron_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/iron_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/iron_axe"
+  }
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/netherite_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/netherite_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/netherite_axe"
+  }
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/stone_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/stone_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/stone_axe"
+  }
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe.json

@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/wooden_axe"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/wooden_axe_blocking"
+        }
+    ]
+}

src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe_blocking.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/wooden_axe"
+  }
+}

src/main/resources/resourcepacks/blocking_predicates/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 12,
+    "description": "§2Provides the required predicates for Sword Blocking"
+  }
+}

src/main/resources/swordblocking.mixins.json

@@ -1,9 +1,12 @@
 {
   "required": true,
   "package": "eu.midnightdust.swordblocking.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinPlayerEntityRenderer"
+    "MixinPlayerEntityRenderer",
+    "MixinBipedEntityModel",
+    "MixinInGameHud",
+    "MixinHeldItemRenderer"
   ],
   "injectors": {
     "defaultRequire": 1