MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #116 from Fourmisain/master

Browse source 
Fix knockback resistance not being applied
This commit is contained in:
paulevsGitch 2021-03-19 20:33:07 +03:00 • committed by GitHub
commit 836cac6f7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/ru/betterend/item/EndArmorItem.java
View file

@ -1,17 +1,49 @@
package ru.betterend.item;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.attribute.EntityAttribute;
import net.minecraft.entity.attribute.EntityAttributeModifier;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.Item;
import ru.betterend.mixin.common.ArmorItemAccessor;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
import java.util.UUID;
public class EndArmorItem extends ArmorItem implements Patterned {
public EndArmorItem(ArmorMaterial material, EquipmentSlot slot, Item.Settings settings) {
super(material, slot, settings);
addKnockbackResistance((ArmorItemAccessor) this, slot, this.knockbackResistance);
}
/** Ensures knockback resistance is actually applied */
private static void addKnockbackResistance(ArmorItemAccessor accessor, EquipmentSlot slot, double knockbackResistance) {
if (knockbackResistance == 0) {
return;
}
Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers = accessor.getAttributeModifiers();
// In case Mojang or anyone else decided to fix this
if (attributeModifiers.keys().contains(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE)) {
return;
}
UUID uuid = accessor.getModifiers()[slot.getEntitySlotId()];
// Rebuild attributeModifiers to include knockback resistance
ImmutableMultimap.Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();
builder.putAll(attributeModifiers);
builder.put(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, new EntityAttributeModifier(uuid, "Armor knockback resistance", knockbackResistance, EntityAttributeModifier.Operation.ADDITION));
accessor.setAttributeModifiers(builder.build());
}
@Override
public String getModelPattern(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);

22
src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java Normal file
View file

@ -0,0 +1,22 @@
package ru.betterend.mixin.common;
import com.google.common.collect.Multimap;
import net.minecraft.entity.attribute.EntityAttribute;
import net.minecraft.entity.attribute.EntityAttributeModifier;
import net.minecraft.item.ArmorItem;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.UUID;
@Mixin(ArmorItem.class)
public interface ArmorItemAccessor {
@Accessor("MODIFIERS")
UUID[] getModifiers();
@Accessor("attributeModifiers")
Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers();
@Accessor("attributeModifiers")
void setAttributeModifiers(Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers);
}

1
src/main/resources/betterend.mixins.common.json
View file

@ -4,6 +4,7 @@
"package": "ru.betterend.mixin.common",
"compatibilityLevel": "JAVA_8",
"mixins": [
"ArmorItemAccessor",
"EnchantmentScreenHandlerMixin",
"PlayerAdvancementTrackerMixin",
"CraftingScreenHandlerMixin",