Skip to content

Remove bauble shield copied shield handling via onLivingAttack #11

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

Open
cdstk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove bauble shield copied shield handling via onLivingAttack #11

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
24 changes: 24 additions & 0 deletions src/main/java/fermiummixins/mixin/bountifulbaubles/ItemShieldCobalt_ShieldMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemShield;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import javax.annotation.Nullable;

Expand All @@ -16,4 +22,22 @@ public abstract class ItemShieldCobalt_ShieldMixin extends ItemShield {
public boolean isShield(ItemStack stack, @Nullable EntityLivingBase entity) {
return stack.getItem() == ModItems.shieldCobalt;
}

// Remove jank copy of shield handling
@Inject(
method = "onLivingAttack",
at = @At("HEAD"),
cancellable = true,
remap = false
)
private static void fermiummixins_bountifulBaublesItemShieldCobalt_onLivingAttack(LivingAttackEvent event, CallbackInfo ci){
ci.cancel();
}

// Unbreakable-unusable intention
@Unique
@Override
public void setDamage(@NotNull ItemStack stack, int damage){
super.setDamage(stack, Math.min(damage, this.getMaxDamage(stack)));
}
}