diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..823aca8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+# gradle
+
+.gradle/
+out/
+classes/
+build/
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# fabric
+
+run/
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..ea9ed68
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 MidnightDust
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index d16d11e..e47b6c6 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
-# SwordBlocking
-A minecraft fabric clientside mod to restore sword blocking if you have a shield in your offhand.
+# Sword Blocking
+A minecraft fabric clientside mod to restore sword blocking, you just need a shield in your offhand. 
+Works especially well if you want to use 1.16 on an 1.8 server which is running ViaVersion.
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..99490be
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,80 @@
+plugins {
+	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'maven-publish'
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+minecraft {
+}
+
+repositories {
+	maven { url "https://jitpack.io" }
+}
+
+dependencies {
+	//to change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
+	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
+}
+
+// ensure that the encoding is set to UTF-8, no matter what the system default is
+// this fixes some edge cases with special characters not displaying correctly
+// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
+}
+
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+	classifier = "sources"
+	from sourceSets.main.allSource
+}
+
+jar {
+	from "LICENSE"
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
+		}
+	}
+
+	// select the repositories you want to publish to
+	repositories {
+		// uncomment to publish to the local maven
+		// mavenLocal()
+	}
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..93b7182
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.7
+	loader_version=0.10.8
+
+# Mod Properties
+	mod_version = 1.0.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.26.1+1.16
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..5c2d1cf
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..4b7e1f3
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..8e25e6c
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+  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"
+    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"
+    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
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        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
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..9618d8d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,100 @@
+@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
+
+@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=.
+set APP_BASE_NAME=%~n0
+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.
+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%" == "0" goto init
+
+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.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+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.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..5b60df3
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
new file mode 100644
index 0000000..0d51744
--- /dev/null
+++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
@@ -0,0 +1,21 @@
+package eu.midnightdust.swordblocking;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.minecraft.item.Items;
+import net.minecraft.item.SwordItem;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class SwordBlockingClient implements ClientModInitializer {
+
+    @Override
+    public void onInitializeClient() {
+        Registry.ITEM.forEach((item) -> {
+            if(item instanceof SwordItem) {
+                FabricModelPredicateProviderRegistry.register(item, new Identifier("blocking"), (stack, world, entity) ->
+                        entity != null && entity.getOffHandStack().getItem().equals(Items.SHIELD) && entity.isUsingItem() ? 1.0F : 0.0F);
+            }
+        });
+    }
+}
diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java
new file mode 100644
index 0000000..1b51b8e
--- /dev/null
+++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java
@@ -0,0 +1,32 @@
+package eu.midnightdust.swordblocking.mixin;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.render.entity.PlayerEntityRenderer;
+import net.minecraft.client.render.entity.model.BipedEntityModel;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ShieldItem;
+import net.minecraft.util.Hand;
+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.CallbackInfoReturnable;
+
+@Mixin(PlayerEntityRenderer.class)
+public abstract class MixinPlayerEntityRenderer {
+
+    @Inject(at = @At("HEAD"), method = "getArmPose", cancellable = true)
+    @Environment(EnvType.CLIENT)
+    private static void getArmPose(AbstractClientPlayerEntity abstractClientPlayerEntity, Hand hand, CallbackInfoReturnable<BipedEntityModel.ArmPose> cir) {
+        ItemStack itemStack = abstractClientPlayerEntity.getStackInHand(hand);
+        ItemStack itemStack2 = abstractClientPlayerEntity.getOffHandStack();
+
+        if (itemStack2.getItem() instanceof ShieldItem && abstractClientPlayerEntity.isUsingItem()) {
+            cir.setReturnValue(BipedEntityModel.ArmPose.BLOCK);
+        }
+        if (itemStack.getItem() instanceof ShieldItem) {
+            cir.setReturnValue(BipedEntityModel.ArmPose.EMPTY);
+        }
+    }
+}
diff --git a/src/main/resources/assets/minecraft/models/item/diamond_sword.json b/src/main/resources/assets/minecraft/models/item/diamond_sword.json
new file mode 100644
index 0000000..41d553d
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/diamond_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/diamond_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/diamond_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/diamond_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/diamond_sword_blocking.json
new file mode 100644
index 0000000..15727ea
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/diamond_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/handheld_blocking",
+	"textures": {
+		"layer0": "minecraft:item/diamond_sword"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/golden_sword.json b/src/main/resources/assets/minecraft/models/item/golden_sword.json
new file mode 100644
index 0000000..5e6bb52
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/golden_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/golden_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/golden_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/golden_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/golden_sword_blocking.json
new file mode 100644
index 0000000..1e22054
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/golden_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/golden_sword"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/handheld_blocking.json b/src/main/resources/assets/minecraft/models/item/handheld_blocking.json
new file mode 100644
index 0000000..3378172
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/handheld_blocking.json
@@ -0,0 +1,16 @@
+{
+	"credit": "https://github.com/FoundationGames/Parry/blob/master/src/main/resources/assets/minecraft/models/item/handheld_parry.json",
+    "parent": "item/handheld",
+    "display": {
+        "firstperson_righthand": {
+            "rotation": [ 171, 13, 165 ],
+            "translation": [ -2.8, -0.2, -5 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 171, 13, 75 ],
+            "translation": [ -2.8, -0.2, -5 ],
+            "scale": [ 1, 1, 1 ]
+        }
+    }
+}
diff --git a/src/main/resources/assets/minecraft/models/item/iron_sword.json b/src/main/resources/assets/minecraft/models/item/iron_sword.json
new file mode 100644
index 0000000..38c0f94
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/iron_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/iron_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/iron_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/iron_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/iron_sword_blocking.json
new file mode 100644
index 0000000..262c561
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/iron_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/iron_sword"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/netherite_sword.json b/src/main/resources/assets/minecraft/models/item/netherite_sword.json
new file mode 100644
index 0000000..cd9fc22
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/netherite_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/netherite_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/netherite_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/netherite_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/netherite_sword_blocking.json
new file mode 100644
index 0000000..ec1b96f
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/netherite_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/netherite_sword"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/shield.json b/src/main/resources/assets/minecraft/models/item/shield.json
new file mode 100644
index 0000000..f5be40e
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/shield.json
@@ -0,0 +1,52 @@
+{
+    "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"
+        }
+    ]
+}
diff --git a/src/main/resources/assets/minecraft/models/item/shield_blocking.json b/src/main/resources/assets/minecraft/models/item/shield_blocking.json
new file mode 100644
index 0000000..9d9c071
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/shield_blocking.json
@@ -0,0 +1,34 @@
+{
+    "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 ]
+        }
+    }
+}
diff --git a/src/main/resources/assets/minecraft/models/item/stone_sword.json b/src/main/resources/assets/minecraft/models/item/stone_sword.json
new file mode 100644
index 0000000..4dcc3b6
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/stone_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/stone_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/stone_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/stone_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/stone_sword_blocking.json
new file mode 100644
index 0000000..9287141
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/stone_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/stone_sword"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/wooden_sword.json b/src/main/resources/assets/minecraft/models/item/wooden_sword.json
new file mode 100644
index 0000000..38e5dba
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/wooden_sword.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "minecraft:item/wooden_sword"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "minecraft:item/wooden_sword_blocking"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecraft/models/item/wooden_sword_blocking.json b/src/main/resources/assets/minecraft/models/item/wooden_sword_blocking.json
new file mode 100644
index 0000000..476a19a
--- /dev/null
+++ b/src/main/resources/assets/minecraft/models/item/wooden_sword_blocking.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_blocking",
+  "textures": {
+    "layer0": "minecraft:item/wooden_sword"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/swordblocking/icon.png b/src/main/resources/assets/swordblocking/icon.png
new file mode 100644
index 0000000..b0fdd2b
Binary files /dev/null and b/src/main/resources/assets/swordblocking/icon.png differ
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 0000000..34db264
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,35 @@
+{
+  "schemaVersion": 1,
+  "id": "swordblocking",
+  "version": "${version}",
+
+  "name": "Sword Blocking",
+  "description": "Adds sword blocking back to 1.16, you just need a shield in your offhand!",
+  "authors": [
+    "Motschen",
+    "TeamMidnightDust"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/SwordBlocking",
+    "issues": "https://github.com/TeamMidnightDust/SwordBlocking/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/swordblocking/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "eu.midnightdust.swordblocking.SwordBlockingClient"
+    ]
+  },
+
+  "mixins": [
+    "swordblocking.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}
diff --git a/src/main/resources/swordblocking.mixins.json b/src/main/resources/swordblocking.mixins.json
new file mode 100644
index 0000000..5b932fd
--- /dev/null
+++ b/src/main/resources/swordblocking.mixins.json
@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.swordblocking.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinPlayerEntityRenderer"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
\ No newline at end of file