From 92395ec40a96f853d6ec76d1a71c2010e184211e Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 22 Nov 2024 18:54:39 +0800 Subject: [PATCH] =?UTF-8?q?rifle=E6=B7=BB=E5=8A=A0=E6=96=B0tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/gun/rifle/AK12Item.java | 4 ++-- .../item/gun/rifle/AK47Item.java | 21 ++++++++++++++---- .../item/gun/rifle/Hk416Item.java | 21 ++++++++++++++---- .../superbwarfare/item/gun/rifle/M4Item.java | 21 ++++++++++++++---- .../item/gun/rifle/MarlinItem.java | 22 +++++++++++++++---- .../item/gun/rifle/Mk14Item.java | 22 +++++++++++++++---- .../item/gun/rifle/Qbz95Item.java | 17 ++++++++++++++ .../superbwarfare/item/gun/rifle/SksItem.java | 21 ++++++++++++++---- .../assets/superbwarfare/lang/zh_cn.json | 2 +- 9 files changed, 124 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java index 4ec77e6bc..63eb5b035 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java @@ -215,11 +215,11 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { @Override public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { -// super.appendHoverText(stack, world, list, flag); + } @Override public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { - return Optional.of(new ImageTooltip(128, 20, pStack)); + return Optional.of(new ImageTooltip(150, 20, pStack)); } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java index 5efae3bb0..46271f774 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.AK47ItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -17,18 +18,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -38,6 +39,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -214,4 +217,14 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java index 08607d580..c6ec7ceac 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.Hk416ItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -17,18 +18,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -38,6 +39,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -216,4 +219,14 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java index 33cc08d80..8ca0602ea 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.M4ItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -17,18 +18,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -38,6 +39,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -216,4 +219,14 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java index b1dd2eb09..39f9a5718 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -16,16 +17,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -35,6 +37,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -169,4 +173,14 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java index fdc9dd3cf..bf590d334 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Mk14ItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -16,16 +17,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -35,6 +37,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -133,4 +137,14 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java index 57bc99410..5849519ed 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.Qbz95ItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -18,17 +19,21 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -38,6 +43,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -217,4 +224,14 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java index 580cc83a1..571990cf2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SksItemRenderer; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; @@ -16,18 +17,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -37,6 +38,8 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; +import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -147,4 +150,14 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { public boolean canApplyPerk(Perk perk) { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + + } + + @Override + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(150, 20, pStack)); + } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index d9d8286f9..6c01bd633 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -53,7 +53,7 @@ "des.superbwarfare.tips.bypass": "护甲穿透: ", "des.superbwarfare.tips.distance": "无人机距离你: ", "des.superbwarfare.tips.rpm": "射速: ", - "des.superbwarfare.tips.headshot": "爆头倍率：", + "des.superbwarfare.tips.headshot": "爆头倍率: ", "item.superbwarfare.ammo_box": "弹药盒", "des.superbwarfare.tips.rifle_ammo": "已存储的步枪弹药: ",