diff --git a/gradle.properties b/gradle.properties index 2e30a06..1f75768 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,8 @@ neo_version=20.4.80-beta neo_version_range=[20.4,) loader_version_range=[2,) -arnicalib_version=6.1.0 -arnicalib_version_range=[6.1.0,) +arnicalib_version=6.1.1 +arnicalib_version_range=[6.1.1,) jei_version=17.3.0.49 mod_repository=auioc/HarmonicEnchantments diff --git a/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/AimEnchantment.java b/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/AimEnchantment.java index 9e13bed..0330e39 100644 --- a/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/AimEnchantment.java +++ b/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/AimEnchantment.java @@ -107,7 +107,9 @@ public float onLivingHurt(int lvl, boolean isSource, EquipmentSlot slot, LivingE @Override public void onPlayerTick(int lvl, ItemStack itemStack, EquipmentSlot slot, Player player, TickEvent.Phase phase, LogicalSide side) { - if (phase == TickEvent.Phase.END && side == LogicalSide.SERVER && player.tickCount % 11 == 0 && player.isScoping()) { + if (phase == TickEvent.Phase.END && side == LogicalSide.SERVER + && player.tickCount % 11 == 0 && player.isScoping() + ) { var hit = RayCastUtils.entityOnView(player, 100.0D); if (hit != null && hit.getEntity() instanceof LivingEntity living) { if (!living.hasEffect(MobEffects.GLOWING)) { diff --git a/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/BlessingEnchantment.java b/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/BlessingEnchantment.java index 7fbe39f..3a26fb6 100644 --- a/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/BlessingEnchantment.java +++ b/src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/BlessingEnchantment.java @@ -36,6 +36,7 @@ import net.minecraft.world.item.enchantment.Enchantments; import org.auioc.mcmod.arnicalib.base.collection.ListUtils; import org.auioc.mcmod.arnicalib.base.math.MathUtil; +import org.auioc.mcmod.arnicalib.game.item.ItemUtils; import org.auioc.mcmod.harmonicench.enchantment.HEEnchantments; import org.auioc.mcmod.harmoniclib.enchantment.api.HLEnchantment; import org.auioc.mcmod.harmoniclib.enchantment.api.IItemEnchantment; @@ -117,7 +118,7 @@ public int getDamageProtection(int lvl, ItemStack itemStack, DamageSource source @Override public void onItemTooltip(int lvl, @NotNull ItemStack itemStack, @Nullable Player player, List lines, TooltipFlag flags) { - if (ItemStack.shouldShowInTooltip(itemStack.getHideFlags(), ItemStack.TooltipPart.MODIFIERS)) { // TODO arnicalib + if (ItemUtils.shouldShowInTooltip(itemStack, ItemStack.TooltipPart.MODIFIERS)) { int i = ListUtils.indexOf( lines, (l) -> l.getContents() instanceof TranslatableContents t && TOOLTIP_MODIFIER_KEYS.contains(t.getKey()) diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index be7169f..0000000 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,2 +0,0 @@ -public net.minecraft.world.item.ItemStack getHideFlags()I -public net.minecraft.world.item.ItemStack shouldShowInTooltip(ILnet/minecraft/world/item/ItemStack$TooltipPart;)Z diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 43b7018..acf527e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -14,9 +14,6 @@ description = '''${lib_mod_description}''' [[mixins]] config="harmoniclib.mixin.json" -[[accessTransformers]] -file="META-INF/accesstransformer.cfg" - [[dependencies.${lib_mod_id}]] modId="neoforge" type="required"