From c5eacd363ca897c15ac4904388249ecb9a1b83ef Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 3 Aug 2024 13:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=8B=E4=B8=8D=E8=BF=87?= =?UTF-8?q?=E5=9B=9B=E9=99=84=E9=AD=94=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../mcreator/superbwarfare/enchantment/FourthTimesCharm.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2185e6b2e..a4d84cdee 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ def getGitCommitHash() { return stdout.toString().trim() } -version = '0.1.4-SNAPSHOT-' + getGitCommitHash() +version = '0.1.5-SNAPSHOT-' + getGitCommitHash() group = 'com.Atsushio.superbwarfare' archivesBaseName = 'superbwarfare' diff --git a/src/main/java/net/mcreator/superbwarfare/enchantment/FourthTimesCharm.java b/src/main/java/net/mcreator/superbwarfare/enchantment/FourthTimesCharm.java index 15130d0f1..2a4c31309 100644 --- a/src/main/java/net/mcreator/superbwarfare/enchantment/FourthTimesCharm.java +++ b/src/main/java/net/mcreator/superbwarfare/enchantment/FourthTimesCharm.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.enchantment; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool; import net.minecraft.world.entity.EquipmentSlot; @@ -24,7 +25,7 @@ public class FourthTimesCharm extends Enchantment { @Override public int getMinCost(int pLevel) { - return 20 + 5 * pLevel; + return 20 + 8 * pLevel; } @Override @@ -34,6 +35,6 @@ public class FourthTimesCharm extends Enchantment { @Override public boolean canApplyAtEnchantingTable(ItemStack itemstack) { - return itemstack.is(ModTags.Items.CAN_SHOOT_BULLET); + return itemstack.is(ModTags.Items.CAN_SHOOT_BULLET) && !itemstack.is(ModItems.MINIGUN.get()); } }