From 47dfc2692affa8190f85d87e06c335a3f64a3241 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 22 Nov 2024 19:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BAgun=E7=88=B6=E7=B1=BB=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/tooltip/ClientImageTooltip.java | 8 +++--- .../client/tooltip/ImageTooltip.java | 17 +++++++++++- .../superbwarfare/item/gun/GunItem.java | 13 ++++++++-- .../item/gun/rifle/AK12Item.java | 19 ++------------ .../item/gun/rifle/AK47Item.java | 23 +++++----------- .../item/gun/rifle/Hk416Item.java | 23 +++++----------- .../superbwarfare/item/gun/rifle/M4Item.java | 25 +++++------------- .../item/gun/rifle/MarlinItem.java | 24 +++++------------ .../item/gun/rifle/Mk14Item.java | 26 +++++-------------- .../item/gun/rifle/Qbz95Item.java | 19 ++------------ .../superbwarfare/item/gun/rifle/SksItem.java | 25 +++++------------- 11 files changed, 74 insertions(+), 148 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/tooltip/ClientImageTooltip.java b/src/main/java/net/mcreator/superbwarfare/client/tooltip/ClientImageTooltip.java index c1e9bb9d5..38391125e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/tooltip/ClientImageTooltip.java +++ b/src/main/java/net/mcreator/superbwarfare/client/tooltip/ClientImageTooltip.java @@ -28,9 +28,9 @@ public class ClientImageTooltip implements ClientTooltipComponent { private final ItemStack stack; public ClientImageTooltip(ImageTooltip tooltip) { - this.width = tooltip.width(); - this.height = tooltip.height(); - this.stack = tooltip.stack(); + this.width = tooltip.width; + this.height = tooltip.height; + this.stack = tooltip.stack; } @Override @@ -428,7 +428,7 @@ public class ClientImageTooltip implements ClientTooltipComponent { public int getWidth(@NotNull Font font) { if (Screen.hasShiftDown()) { int width = getMaxPerkDesWidth(font); - return width == 0 ? this.width : Math.max(width, getDefaultMaxWidth(font)); + return width == 0 ? Math.max(this.width, getDefaultMaxWidth(font)) : Math.max(width, getDefaultMaxWidth(font)); } else { return getDefaultMaxWidth(font); } diff --git a/src/main/java/net/mcreator/superbwarfare/client/tooltip/ImageTooltip.java b/src/main/java/net/mcreator/superbwarfare/client/tooltip/ImageTooltip.java index e0b053ebc..869056fb9 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/tooltip/ImageTooltip.java +++ b/src/main/java/net/mcreator/superbwarfare/client/tooltip/ImageTooltip.java @@ -3,5 +3,20 @@ package net.mcreator.superbwarfare.client.tooltip; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; -public record ImageTooltip(int width, int height, ItemStack stack) implements TooltipComponent { +public class ImageTooltip implements TooltipComponent { + + public int width; + public int height; + public ItemStack stack; + + public ImageTooltip(int width, int height, ItemStack stack) { + this.width = width; + this.height = height; + this.stack = stack; + } + + public ImageTooltip(ItemStack stack) { + this(32, 16, stack); + } + } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java index 38287c44c..5c797d5bd 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.tooltip.ImageTooltip; import net.mcreator.superbwarfare.init.ModPerks; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.ModVariables; @@ -23,6 +24,7 @@ import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; @@ -32,8 +34,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import org.jetbrains.annotations.NotNull; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.UUID; @@ -115,9 +119,14 @@ public abstract class GunItem extends Item { return map; } +// @Override +// public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { +// TooltipTool.addGunTips(list, stack); +// } + @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); + public @NotNull Optional getTooltipImage(@NotNull ItemStack pStack) { + return Optional.of(new ImageTooltip(pStack)); } public Set getReloadSound() { 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 63eb5b035..23ced8b2a 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 @@ -3,7 +3,6 @@ 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.AK12ItemRenderer; -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,21 +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.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; @@ -42,12 +37,11 @@ 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; public class AK12Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -200,7 +194,7 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/ak12_icon.png"); + return ModUtils.loc("textures/gun_icon/ak12_icon.png"); } @Override @@ -213,13 +207,4 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { 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/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java index 46271f774..d3c58ed7e 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,7 +3,6 @@ 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; @@ -18,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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; +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.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; @@ -39,12 +38,11 @@ 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; public class AK47Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -205,7 +203,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/ak_47_icon.png"); + return ModUtils.loc("textures/gun_icon/ak_47_icon.png"); } @Override @@ -218,13 +216,4 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { 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 c6ec7ceac..c8f04cd70 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,7 +3,6 @@ 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; @@ -18,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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; +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.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; @@ -39,12 +38,11 @@ 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; public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -207,7 +205,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/hk416_icon.png"); + return ModUtils.loc("textures/gun_icon/hk416_icon.png"); } @Override @@ -220,13 +218,4 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { 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 8ca0602ea..292d543ae 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,7 +3,6 @@ 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; @@ -18,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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; +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.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; @@ -39,12 +38,11 @@ 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; public class M4Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -192,7 +190,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { double customZoom = switch (scopeType) { case 0, 1 -> 0; - case 2 -> stack.getOrCreateTag().getBoolean("ScopeAlt")? 0 : 2.75; + case 2 -> stack.getOrCreateTag().getBoolean("ScopeAlt") ? 0 : 2.75; default -> stack.getOrCreateTag().getDouble("CustomZoom"); }; @@ -207,7 +205,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/m4_icon.png"); + return ModUtils.loc("textures/gun_icon/m4_icon.png"); } @Override @@ -220,13 +218,4 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { 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 39f9a5718..3fe2db719 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,7 +3,6 @@ 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; @@ -17,17 +16,16 @@ 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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; -import net.minecraft.world.level.Level; +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.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,12 +35,11 @@ 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; public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -161,7 +158,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/marlin_icon.png"); + return ModUtils.loc("textures/gun_icon/marlin_icon.png"); } @Override @@ -174,13 +171,4 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { 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 bf590d334..6f7781249 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 @@ -1,8 +1,8 @@ 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.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; @@ -12,22 +12,20 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; 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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; -import net.minecraft.world.level.Level; +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.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,12 +35,11 @@ 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; public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -125,7 +122,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/mk14ebr_icon.png"); + return ModUtils.loc("textures/gun_icon/mk14ebr_icon.png"); } @Override @@ -138,13 +135,4 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { 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 5849519ed..105f7eeec 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,7 +3,6 @@ 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; @@ -19,21 +18,17 @@ 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; @@ -43,12 +38,11 @@ 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; public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -212,7 +206,7 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/qbz95_icon.png"); + return ModUtils.loc("textures/gun_icon/qbz95_icon.png"); } @Override @@ -225,13 +219,4 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { 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 571990cf2..2eb1305a5 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 @@ -1,8 +1,8 @@ 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.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; @@ -12,23 +12,22 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; 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.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.*; +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.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,12 +37,11 @@ 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; public class SksItem extends GunItem implements GeoItem, AnimatedItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -138,7 +136,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { @Override public ResourceLocation getGunIcon() { - return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/sks_icon.png"); + return ModUtils.loc("textures/gun_icon/sks_icon.png"); } @Override @@ -151,13 +149,4 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { 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