From 72113034eaa5b269beef377fb1e51a1e6861605c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 19 Mar 2021 20:51:13 +0300 Subject: [PATCH] Mixin correction --- src/main/java/ru/betterend/item/EndArmorItem.java | 6 +++--- .../betterend/mixin/common/ArmorItemAccessor.java | 6 +++--- .../block/cave_pumpkin_lantern_bottom.png | Bin 0 -> 240 bytes .../textures/block/cave_pumpkin_lantern_side.png | Bin 0 -> 225 bytes .../textures/block/cave_pumpkin_side.png | Bin 0 -> 219 bytes .../betterend/textures/block/cave_pumpkin_top.png | Bin 0 -> 229 bytes src/main/resources/betterend.mixins.common.json | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/cave_pumpkin_lantern_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/cave_pumpkin_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/cave_pumpkin_top.png 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 0000000000000000000000000000000000000000..6c35ab7d695c9bf1678c27f018bb04511826b498 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~xd5LKS0LRU z;kKkG@IX)Wg)PlDPE5afa{B$-t6w}l^zp+jsl^|RfGW63g8YIR{=-0Br$`u3G|SV) zF+^f&YJVVKg8_$gsxITZ`o!+pZn7`gD;*ji-#9c^g6$T=UFne21zZzDc_Wm3JULkx zs7OrW5|Ehqu)y=Azy$dOU7@ndl6Ie~fwoQN4`d#ur_5xtS^jdf+4Wm*H@yAwbIzZ4 b&+7`AoS(C}Twk*liWS0LRU z;kKkGa8rHQfu86KTbgg2n11u*^!vA0zj%7+*mY`2{olhlAR(+N(g} za8DP<5Q(XC&j)ffIB>9BxLP8y_kUyYs{REE8LBoPYT2 z1Y&z$txG87dE&rTq;Q{sSs;NS|AX!0jbR5@Bs`HkQ*xxV`{pgimtHJgYsA$~01 MboFyt=akR{00O^S&j0`b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a91ba7500c568b382f03a0f2de09eaf4c3299cab GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~xd5LKS0LRU z;kKkG@IX&=t(e^m1(ySAA$wgSZ}_G@NUsTvU-=uTf~zFRFPPy!4AgasgaJiEJzX3_ zB&M$I_vUIa;BmQZ_W9*s{Tv;q(1PdDzH&1il>DOP7jGABzU&etX5-qnY(fI>1a;AE zMuD>$c*ENTx5ge7)ju$+ewpsOMdJP&>wgNpKV?_NP_cyZjs(ZiKR^o@JYD@<);T3K F0RZ*(O*8-i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..821029c3ee0b59b7f7b814b80db9dfd4cf1a1c9f GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0G(0 zW;a8@<$zkqUYE!lzNsSB3LQXEwvr&fV21x7P*wThA5bLU)5S4FVrr;=G~WRQo~*`u z|4%jRMPK1xY!jv7