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 b0fdd2b..0000000 Binary files a/src/main/resources/resourcepacks/blocking_predicates/pack.png and /dev/null differ