Skip to content

Add the minecraft:disables_blocking melee weapon type #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErrorCraft merged 1 commit into from
Aug 2, 2026
Merged

Add the minecraft:disables_blocking melee weapon type #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/copper_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
"rules": []
},
"attack_speed": 0.2,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/diamond_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
"rules": []
},
"attack_speed": 0.25,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/golden_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
"rules": []
},
"attack_speed": 0.25,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/iron_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
"rules": []
},
"attack_speed": 0.225,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/netherite_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@
"rules": []
},
"attack_speed": 0.25,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/stone_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
"rules": []
},
"attack_speed": 0.2,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
8 changes: 6 additions & 2 deletions src/main/generated/data/minecraft/item/wooden_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@
"rules": []
},
"attack_speed": 0.2,
"disable_blocking_for_seconds": 5.0,
"item_damage_per_attack": 2
"item_damage_per_attack": 2,
"types": {
"minecraft:disables_blocking": {
"seconds": 5.0
}
}
}
},
"display": {
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/net/errorcraft/itematic/item/component/components/WeaponItemComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import net.errorcraft.itematic.item.event.ItemEvents;
import net.errorcraft.itematic.item.weapon.melee.MeleeWeaponComponents;
import net.errorcraft.itematic.item.weapon.melee.MeleeWeaponWithDataComponents;
import net.errorcraft.itematic.item.weapon.melee.component.DisablesBlockingMeleeWeapon;
import net.errorcraft.itematic.item.weapon.melee.component.KineticMeleeWeapon;
import net.errorcraft.itematic.item.weapon.melee.component.SmashingMeleeWeapon;
import net.errorcraft.itematic.serialization.ItematicCodecs;
Expand Down Expand Up @@ -38,10 +39,9 @@
import java.util.List;
import java.util.Optional;

public record WeaponItemComponent(int itemDamagePerAttack, float disableBlockingForSeconds, ComponentMap types, Optional<RegistryEntry<DamageType>> damageType, Optional<SwingAnimationComponent> swingAnimation, WeaponAttackDamageDataComponent attackDamage, double attackSpeed, Optional<AttackRangeComponent> attackRange, Optional<Float> minimumAttackCharge) implements ItemComponent<WeaponItemComponent>, ComponentHolder {
public record WeaponItemComponent(int itemDamagePerAttack, ComponentMap types, Optional<RegistryEntry<DamageType>> damageType, Optional<SwingAnimationComponent> swingAnimation, WeaponAttackDamageDataComponent attackDamage, double attackSpeed, Optional<AttackRangeComponent> attackRange, Optional<Float> minimumAttackCharge) implements ItemComponent<WeaponItemComponent>, ComponentHolder {
public static final Codec<WeaponItemComponent> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codecs.NON_NEGATIVE_INT.optionalFieldOf("item_damage_per_attack", 1).forGetter(WeaponItemComponent::itemDamagePerAttack),
Codecs.NON_NEGATIVE_FLOAT.optionalFieldOf("disable_blocking_for_seconds", 0.0f).forGetter(WeaponItemComponent::disableBlockingForSeconds),
MeleeWeaponComponents.CODEC.optionalFieldOf("types", ComponentMap.EMPTY).forGetter(WeaponItemComponent::types),
DamageType.ENTRY_CODEC.optionalFieldOf("damage_type").forGetter(WeaponItemComponent::damageType),
SwingAnimationComponent.CODEC.optionalFieldOf("swing_animation").forGetter(WeaponItemComponent::swingAnimation),
Expand Down Expand Up @@ -101,7 +101,11 @@ public void using(ItemStack stack, World world, LivingEntity user, int usedTicks

@Override
public void addComponents(ComponentMap.Builder builder) {
builder.add(DataComponentTypes.WEAPON, new WeaponComponent(this.itemDamagePerAttack, this.disableBlockingForSeconds));
DisablesBlockingMeleeWeapon disablesBlocking = this.types.get(MeleeWeaponComponents.DISABLES_BLOCKING);
builder.add(DataComponentTypes.WEAPON, new WeaponComponent(
this.itemDamagePerAttack,
disablesBlocking != null ? disablesBlocking.seconds() : 0.0f
));
builder.add(ItematicDataComponentTypes.WEAPON_ATTACK_DAMAGE, this.attackDamage);
builder.add(ItematicDataComponentTypes.ATTACK_SPEED_MULTIPLIER, this.attackSpeed);
this.streamAll(MeleeWeaponWithDataComponents.class)
Expand Down Expand Up @@ -151,7 +155,6 @@ public static class Builder {
private final double attackSpeed;
private AttackRangeComponent attackRange;
private Float minimumAttackCharge;
private float disableBlockingForSeconds;

private Builder(int itemDamagePerAttack, double attackDamage, double attackSpeed) {
this.itemDamagePerAttack = itemDamagePerAttack;
Expand All @@ -162,7 +165,6 @@ private Builder(int itemDamagePerAttack, double attackDamage, double attackSpeed
public WeaponItemComponent build() {
return new WeaponItemComponent(
this.itemDamagePerAttack,
this.disableBlockingForSeconds,
this.types.build(),
Optional.ofNullable(this.damageType),
Optional.ofNullable(this.swingAnimation),
Expand Down Expand Up @@ -199,7 +201,10 @@ public Builder minimumAttackCharge(float minimumAttackCharge) {
}

public Builder disableBlockingForSeconds(float disableBlockingForSeconds) {
this.disableBlockingForSeconds = disableBlockingForSeconds;
if (disableBlockingForSeconds > 0.0f) {
this.type(MeleeWeaponComponents.DISABLES_BLOCKING, new DisablesBlockingMeleeWeapon(disableBlockingForSeconds));
}

return this;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/errorcraft/itematic/item/weapon/melee/MeleeWeaponComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.errorcraft.itematic.item.weapon.melee;

import com.mojang.serialization.Codec;
import net.errorcraft.itematic.item.weapon.melee.component.DisablesBlockingMeleeWeapon;
import net.errorcraft.itematic.item.weapon.melee.component.KineticMeleeWeapon;
import net.errorcraft.itematic.item.weapon.melee.component.PiercingMeleeWeapon;
import net.errorcraft.itematic.item.weapon.melee.component.SmashingMeleeWeapon;
Expand All @@ -17,6 +18,7 @@ public class MeleeWeaponComponents {
public static final ComponentType<SmashingMeleeWeapon> SMASHING = register("smashing", builder -> builder.codec(SmashingMeleeWeapon.CODEC));
public static final ComponentType<KineticMeleeWeapon> KINETIC = register("kinetic", builder -> builder.codec(KineticMeleeWeapon.CODEC));
public static final ComponentType<PiercingMeleeWeapon> PIERCING = register("piercing", builder -> builder.codec(PiercingMeleeWeapon.CODEC));
public static final ComponentType<DisablesBlockingMeleeWeapon> DISABLES_BLOCKING = register("disables_blocking", builder -> builder.codec(DisablesBlockingMeleeWeapon.CODEC));

private MeleeWeaponComponents() {}

Expand Down
11 changes: 11 additions & 0 deletions ...java/net/errorcraft/itematic/item/weapon/melee/component/DisablesBlockingMeleeWeapon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package net.errorcraft.itematic.item.weapon.melee.component;

import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.util.dynamic.Codecs;

public record DisablesBlockingMeleeWeapon(float seconds) {
public static final Codec<DisablesBlockingMeleeWeapon> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codecs.NON_NEGATIVE_FLOAT.fieldOf("seconds").forGetter(DisablesBlockingMeleeWeapon::seconds)
).apply(instance, DisablesBlockingMeleeWeapon::new));
}
Loading