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

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