From 8c0d82a2c837da7f71da572a251c0da87f47fd66 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 7 May 2024 16:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=8F=E8=BF=B0=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mcreator/target/init/TargetModTabs.java | 4 ---- src/main/java/net/mcreator/target/item/gun/RpgItem.java | 8 +++++--- src/main/java/net/mcreator/target/item/gun/Taser.java | 8 +++++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/mcreator/target/init/TargetModTabs.java b/src/main/java/net/mcreator/target/init/TargetModTabs.java index d7a8b0448..ddb427548 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModTabs.java @@ -31,7 +31,6 @@ public class TargetModTabs { output.accept(AK47Item.getGunInstance()); output.accept(M4Item.getGunInstance()); output.accept(Hk416Item.getGunInstance()); - output.accept(Mk14Item.getGunInstance()); output.accept(MarlinItem.getGunInstance()); output.accept(SvdItem.getGunInstance()); @@ -39,15 +38,12 @@ public class TargetModTabs { output.accept(M98bItem.getGunInstance()); output.accept(SentinelItem.getGunInstance()); output.accept(Kraber.getGunInstance()); - output.accept(M870Item.getGunInstance()); output.accept(Aa12Item.getGunInstance()); - output.accept(Devotion.getGunInstance()); output.accept(RpkItem.getGunInstance()); output.accept(M60Item.getGunInstance()); output.accept(Minigun.getGunInstance()); - output.accept(BocekItem.getGunInstance()); output.accept(M79Item.getGunInstance()); output.accept(RpgItem.getGunInstance()); diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 1251ad25c..1a9e09bb1 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -1,6 +1,8 @@ package net.mcreator.target.item.gun; +import net.mcreator.target.TargetMod; import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.TooltipTool; import software.bernie.geckolib.util.GeckoLibUtil; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.core.animation.RawAnimation; @@ -148,14 +150,14 @@ public class RpgItem extends GunItem implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.11f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.11f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + TooltipTool.addGunTips(list, stack); } @Override diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 1352ab1b5..735b35fcf 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.procedures.TasercooldownProcedure; import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -132,7 +134,7 @@ public class Taser extends GunItem implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.01f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.01f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -143,8 +145,8 @@ public class Taser extends GunItem implements GeoItem { } @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + TooltipTool.addGunTips(list, stack); } @Override