diff --git a/src/main/java/ru/betterend/item/EndArmorItem.java b/src/main/java/ru/betterend/item/EndArmorItem.java index 4d95d2c4..58688011 100644 --- a/src/main/java/ru/betterend/item/EndArmorItem.java +++ b/src/main/java/ru/betterend/item/EndArmorItem.java @@ -28,20 +28,20 @@ public class EndArmorItem extends ArmorItem implements Patterned { return; } - Multimap attributeModifiers = accessor.getAttributeModifiers(); + Multimap attributeModifiers = accessor.be_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()]; + UUID uuid = accessor.be_getModifiers()[slot.getEntitySlotId()]; // Rebuild attributeModifiers to include knockback resistance ImmutableMultimap.Builder 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()); + accessor.be_setAttributeModifiers(builder.build()); } @Override diff --git a/src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java b/src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java index 5c340f88..39046ec7 100644 --- a/src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java +++ b/src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java @@ -12,11 +12,11 @@ import java.util.UUID; @Mixin(ArmorItem.class) public interface ArmorItemAccessor { @Accessor("MODIFIERS") - UUID[] getModifiers(); + UUID[] be_getModifiers(); @Accessor("attributeModifiers") - Multimap getAttributeModifiers(); + Multimap be_getAttributeModifiers(); @Accessor("attributeModifiers") - void setAttributeModifiers(Multimap attributeModifiers); + void be_setAttributeModifiers(Multimap attributeModifiers); } diff --git a/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_bottom.png new file mode 100644 index 00000000..6c35ab7d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_side.png b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_side.png new file mode 100644 index 00000000..ede34999 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_pumpkin_side.png b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_side.png new file mode 100644 index 00000000..a91ba750 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_pumpkin_top.png b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_top.png new file mode 100644 index 00000000..821029c3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/cave_pumpkin_top.png differ diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index f070cf63..5ce208b8 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -4,7 +4,6 @@ "package": "ru.betterend.mixin.common", "compatibilityLevel": "JAVA_8", "mixins": [ - "ArmorItemAccessor", "EnchantmentScreenHandlerMixin", "PlayerAdvancementTrackerMixin", "CraftingScreenHandlerMixin", @@ -28,8 +27,9 @@ "PlayerManagerMixin", "RecipeManagerMixin", "HostileEntityMixin", - "LivingEntityMixin", + "ArmorItemAccessor", "BoneMealItemMixin", + "LivingEntityMixin", "PlayerEntityMixin", "ServerWorldMixin", "SlimeEntityMixin",