From 95454d1c3338c9a565e13be3479cfde83a71d8b0 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 10 Jun 2024 15:39:43 +0200 Subject: [PATCH] Improved way of rendering the blocking animation - Now no longer depends on the integrated resourcepack - Improved compatibility with resourcepacks and mods (closes #17) - Big thanks to @lowercasebtw for contributing this part of the code - Fixed #13 --- gradle.properties | 2 +- .../swordblocking/SwordBlockingClient.java | 18 ------------------ .../mixin/MixinHeldItemRenderer.java | 16 ++++++++++++++++ .../mixin/MixinPlayerEntityRenderer.java | 12 ++++++------ src/main/resources/fabric.mod.json | 3 ++- .../minecraft/models/item/diamond_axe.json | 15 --------------- .../models/item/diamond_axe_blocking.json | 6 ------ .../minecraft/models/item/diamond_sword.json | 15 --------------- .../models/item/diamond_sword_blocking.json | 6 ------ .../minecraft/models/item/golden_axe.json | 15 --------------- .../models/item/golden_axe_blocking.json | 6 ------ .../minecraft/models/item/golden_sword.json | 15 --------------- .../models/item/golden_sword_blocking.json | 6 ------ .../models/item/handheld_blocking.json | 16 ---------------- .../minecraft/models/item/iron_axe.json | 15 --------------- .../models/item/iron_axe_blocking.json | 6 ------ .../minecraft/models/item/iron_sword.json | 15 --------------- .../models/item/iron_sword_blocking.json | 6 ------ .../minecraft/models/item/netherite_axe.json | 15 --------------- .../models/item/netherite_axe_blocking.json | 6 ------ .../models/item/netherite_sword.json | 15 --------------- .../models/item/netherite_sword_blocking.json | 6 ------ .../minecraft/models/item/stone_axe.json | 15 --------------- .../models/item/stone_axe_blocking.json | 6 ------ .../minecraft/models/item/stone_sword.json | 15 --------------- .../models/item/stone_sword_blocking.json | 6 ------ .../minecraft/models/item/wooden_axe.json | 15 --------------- .../models/item/wooden_axe_blocking.json | 6 ------ .../minecraft/models/item/wooden_sword.json | 15 --------------- .../models/item/wooden_sword_blocking.json | 6 ------ .../blocking_predicates/pack.mcmeta | 11 ----------- .../blocking_predicates/pack.png | Bin 3517 -> 0 bytes 32 files changed, 25 insertions(+), 305 deletions(-) delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/handheld_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe_blocking.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword.json delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword_blocking.json delete mode 100755 src/main/resources/resourcepacks/blocking_predicates/pack.mcmeta delete mode 100644 src/main/resources/resourcepacks/blocking_predicates/pack.png diff --git a/gradle.properties b/gradle.properties index 1875bf4..6e9c99f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.parallel=true loader_version=0.15.11 # Mod Properties - mod_version = 1.3.2 + mod_version = 2.0.0 maven_group = eu.midnightdust archives_base_name = swordblocking release_type=release diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java index a12182d..17787cb 100644 --- a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java +++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java @@ -2,33 +2,15 @@ package eu.midnightdust.swordblocking; import eu.midnightdust.swordblocking.config.SwordBlockingConfig; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.resource.ResourceManagerHelper; -import net.fabricmc.fabric.api.resource.ResourcePackActivationType; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.minecraft.entity.LivingEntity; import net.minecraft.item.AxeItem; -import net.minecraft.item.Item; import net.minecraft.item.ShieldItem; import net.minecraft.item.SwordItem; -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)) - 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) { diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java index 029d40b..006f381 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java @@ -2,6 +2,7 @@ package eu.midnightdust.swordblocking.mixin; import eu.midnightdust.swordblocking.SwordBlockingClient; import eu.midnightdust.swordblocking.config.SwordBlockingConfig; +import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.HeldItemRenderer; import net.minecraft.client.render.model.json.ModelTransformationMode; @@ -9,6 +10,9 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ShieldItem; +import net.minecraft.util.Arm; +import net.minecraft.util.Hand; +import net.minecraft.util.math.RotationAxis; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -21,4 +25,16 @@ public abstract class MixinHeldItemRenderer { if ((SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) || (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity))) ci.cancel(); } + @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;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", shift = At.Shift.BEFORE, ordinal = 1)) + public void swordblocking$blockingPosition(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { + if (!SwordBlockingClient.isWeaponBlocking(player) || item.getItem() instanceof ShieldItem) + return; + boolean bl = hand == Hand.MAIN_HAND; + Arm arm = bl ? player.getMainArm() : player.getMainArm().getOpposite(); + int k = arm == Arm.RIGHT ? 1 : -1; + matrices.translate(k * -0.14142136F, 0.08F, 0.14142136F); + matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-102.25F)); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(k * 13.365F)); + matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(k * 78.05F)); + } } diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java index 6bedb54..a50ebc0 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinPlayerEntityRenderer.java @@ -19,17 +19,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public abstract class MixinPlayerEntityRenderer { @Inject(at = @At(value = "RETURN"), method = "getArmPose", cancellable = true) @Environment(EnvType.CLIENT) - private static void swordblocking$getArmPose(AbstractClientPlayerEntity abstractClientPlayerEntity, Hand hand, CallbackInfoReturnable cir) { + private static void swordblocking$getArmPose(AbstractClientPlayerEntity player, 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)) + ItemStack handStack = player.getStackInHand(hand); + ItemStack offStack = player.getStackInHand(hand.equals(Hand.MAIN_HAND) ? Hand.OFF_HAND : Hand.MAIN_HAND); + if (!SwordBlockingConfig.alwaysHideShield && (handStack.getItem() instanceof ShieldItem) && !SwordBlockingClient.canWeaponBlock(player)) return; - if (offStack.getItem() instanceof ShieldItem && abstractClientPlayerEntity.isUsingItem()) { + if (offStack.getItem() instanceof ShieldItem && SwordBlockingClient.isWeaponBlocking(player)) { cir.setReturnValue(BipedEntityModel.ArmPose.BLOCK); - } else if (handStack.getItem() instanceof ShieldItem && SwordBlockingConfig.hideShield) { + } else if (handStack.getItem() instanceof ShieldItem && SwordBlockingConfig.hideShield && (cir.getReturnValue() == BipedEntityModel.ArmPose.ITEM || cir.getReturnValue() == BipedEntityModel.ArmPose.BLOCK)) { cir.setReturnValue(BipedEntityModel.ArmPose.EMPTY); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a5c6b01..6410819 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -7,7 +7,8 @@ "description": "Adds sword blocking to new versions, you just need a shield in your offhand!", "authors": [ "Motschen", - "TeamMidnightDust" + "TeamMidnightDust", + "lowercasebtw" ], "contact": { "homepage": "https://www.midnightdust.eu/", diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe.json deleted file mode 100644 index 41ae0c8..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/diamond_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/diamond_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe_blocking.json deleted file mode 100644 index cc4b84f..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/diamond_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword.json deleted file mode 100644 index 41d553d..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword_blocking.json deleted file mode 100644 index 15727ea..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/diamond_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/diamond_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe.json deleted file mode 100644 index b3e0040..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/golden_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/golden_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe_blocking.json deleted file mode 100644 index cf3c3fd..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/golden_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword.json deleted file mode 100644 index 5e6bb52..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword_blocking.json deleted file mode 100644 index 1e22054..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/golden_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/golden_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/handheld_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/handheld_blocking.json deleted file mode 100644 index 3378172..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/handheld_blocking.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe.json deleted file mode 100644 index 95b67a1..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/iron_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/iron_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe_blocking.json deleted file mode 100644 index aa8626e..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/iron_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword.json deleted file mode 100644 index 38c0f94..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword_blocking.json deleted file mode 100644 index 262c561..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/iron_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/iron_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe.json deleted file mode 100644 index c67759b..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/netherite_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/netherite_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe_blocking.json deleted file mode 100644 index 4d7595c..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/netherite_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword.json deleted file mode 100644 index cd9fc22..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword_blocking.json deleted file mode 100644 index ec1b96f..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/netherite_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/netherite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe.json deleted file mode 100644 index 556dfcc..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/stone_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/stone_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe_blocking.json deleted file mode 100644 index 3a524c7..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/stone_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword.json deleted file mode 100644 index 4dcc3b6..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword_blocking.json deleted file mode 100644 index 9287141..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/stone_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/stone_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe.json deleted file mode 100644 index 0a28b85..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/wooden_axe" - }, - - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "minecraft:item/wooden_axe_blocking" - } - ] -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe_blocking.json deleted file mode 100644 index 3d90ec7..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_axe_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/wooden_axe" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword.json deleted file mode 100644 index 38e5dba..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword_blocking.json b/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword_blocking.json deleted file mode 100644 index 476a19a..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/assets/minecraft/models/item/wooden_sword_blocking.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_blocking", - "textures": { - "layer0": "minecraft:item/wooden_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/blocking_predicates/pack.mcmeta b/src/main/resources/resourcepacks/blocking_predicates/pack.mcmeta deleted file mode 100755 index b59308f..0000000 --- a/src/main/resources/resourcepacks/blocking_predicates/pack.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "pack": { - "pack_format": 12, - "_comment_": "'supported_formats' only works for 1.20.2+", - "supported_formats": { - "min_inclusive": 12, - "max_inclusive": 100 - }, - "description": "ยง2Provides the required predicates for Sword Blocking" - } -} diff --git a/src/main/resources/resourcepacks/blocking_predicates/pack.png b/src/main/resources/resourcepacks/blocking_predicates/pack.png deleted file mode 100644 index b0fdd2b0165b993fba67ce32c25ba74a10b3d7b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3517 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