diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java index 540f846d8..9f9bc3a11 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.AK47Item; +import net.mcreator.superbwarfare.item.gun.rifle.AK47Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java index 42e605049..3cbd7d2f0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.Hk416Item; +import net.mcreator.superbwarfare.item.gun.rifle.Hk416Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java index b4443c557..a2776ae1a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.M4Item; +import net.mcreator.superbwarfare.item.gun.rifle.M4Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java index c91bb5a1e..ea94bbb8f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.MarlinItem; +import net.mcreator.superbwarfare.item.gun.rifle.MarlinItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java index d1a9d6f9a..0ab073b32 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.Mk14Item; +import net.mcreator.superbwarfare.item.gun.rifle.Mk14Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Qbz95Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Qbz95Layer.java index 37f74ca2f..5687a333a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Qbz95Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Qbz95Layer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.Qbz95Item; +import net.mcreator.superbwarfare.item.gun.rifle.Qbz95Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java index 44f169c4d..53ed892f8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.item.gun.SksItem; +import net.mcreator.superbwarfare.item.gun.rifle.SksItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java index c3799775b..d22108fc1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.AK47Item; +import net.mcreator.superbwarfare.item.gun.rifle.AK47Item; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index d60580526..914e81ab0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.Hk416Item; +import net.mcreator.superbwarfare.item.gun.rifle.Hk416Item; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index 2916e1162..3c2d00e1c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.M4Item; +import net.mcreator.superbwarfare.item.gun.rifle.M4Item; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java index 0e822d8eb..a772d70ff 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.MarlinItem; +import net.mcreator.superbwarfare.item.gun.rifle.MarlinItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java index bd8519f9d..eb59c8b6e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.Mk14Item; +import net.mcreator.superbwarfare.item.gun.rifle.Mk14Item; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java index af5a308cf..3cb17fe67 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.Qbz95Item; +import net.mcreator.superbwarfare.item.gun.rifle.Qbz95Item; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java index 2f3087623..b29e41995 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.item.gun.SksItem; +import net.mcreator.superbwarfare.item.gun.rifle.SksItem; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java index ef07a2368..8ccb794ed 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.AK47Layer; import net.mcreator.superbwarfare.client.model.item.AK47ItemModel; -import net.mcreator.superbwarfare.item.gun.AK47Item; +import net.mcreator.superbwarfare.item.gun.rifle.AK47Item; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 0f1a9ba2b..5787d1d99 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Hk416Layer; import net.mcreator.superbwarfare.client.model.item.Hk416ItemModel; -import net.mcreator.superbwarfare.item.gun.Hk416Item; +import net.mcreator.superbwarfare.item.gun.rifle.Hk416Item; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java index 33becb535..f31d75cbc 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.M4Layer; import net.mcreator.superbwarfare.client.model.item.M4ItemModel; -import net.mcreator.superbwarfare.item.gun.M4Item; +import net.mcreator.superbwarfare.item.gun.rifle.M4Item; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java index 8bb13d270..16660a7e4 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.MarlinLayer; import net.mcreator.superbwarfare.client.model.item.MarlinItemModel; -import net.mcreator.superbwarfare.item.gun.MarlinItem; +import net.mcreator.superbwarfare.item.gun.rifle.MarlinItem; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index ce5e50638..9f43cc377 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Mk14Layer; import net.mcreator.superbwarfare.client.model.item.Mk14ItemModel; -import net.mcreator.superbwarfare.item.gun.Mk14Item; +import net.mcreator.superbwarfare.item.gun.rifle.Mk14Item; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index fa16f5ab6..bcd1dc11b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Qbz95Layer; import net.mcreator.superbwarfare.client.model.item.Qbz95ItemModel; -import net.mcreator.superbwarfare.item.gun.Qbz95Item; +import net.mcreator.superbwarfare.item.gun.rifle.Qbz95Item; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java index 243ef6c33..4ebcff20a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.SksLayer; import net.mcreator.superbwarfare.client.model.item.SksItemModel; -import net.mcreator.superbwarfare.item.gun.SksItem; +import net.mcreator.superbwarfare.item.gun.rifle.SksItem; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.AnimUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 76c2d7716..ab85a5b6f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.item.common.BlueprintItem; import net.mcreator.superbwarfare.item.common.MaterialPack; import net.mcreator.superbwarfare.item.common.ammo.*; import net.mcreator.superbwarfare.item.gun.*; +import net.mcreator.superbwarfare.item.gun.rifle.*; import net.mcreator.superbwarfare.tools.RarityTool; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java index 17dc08b2f..1eb2e66cc 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.init; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.*; +import net.mcreator.superbwarfare.item.gun.rifle.*; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java similarity index 92% rename from src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java index 0ad816e89..78af99752 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -25,8 +26,10 @@ import net.minecraft.world.entity.LivingEntity; 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.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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -37,7 +40,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -78,7 +80,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -123,7 +125,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -151,11 +153,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); @@ -188,4 +185,9 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return " AK-47"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java similarity index 92% rename from src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java index 28fd58234..4daecb724 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -25,8 +26,10 @@ import net.minecraft.world.entity.LivingEntity; 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.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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -37,7 +40,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -73,7 +75,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -118,7 +120,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -158,11 +160,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return map; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - @Override public Set getReloadSound() { return Set.of(ModSounds.HK_416_RELOAD_EMPTY.get(), ModSounds.HK_416_RELOAD_NORMAL.get()); @@ -188,4 +185,9 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return " HK-416"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java similarity index 98% rename from src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java index de7d6b0e3..320284566 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,6 +8,7 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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; diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java similarity index 93% rename from src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java index 8a3cc3412..814b27f28 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -26,7 +27,10 @@ import net.minecraft.world.entity.LivingEntity; 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.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 software.bernie.geckolib.animatable.GeoItem; @@ -38,7 +42,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -74,7 +77,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -134,7 +137,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -162,11 +165,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - @Override public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); @@ -213,4 +211,9 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return " MARLIN-1894"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java similarity index 92% rename from src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java index 1a719a0b8..e75c4acdc 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -25,8 +26,10 @@ import net.minecraft.world.entity.LivingEntity; 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.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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -37,7 +40,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -73,7 +75,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -118,7 +120,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -146,11 +148,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - @Override public Set getReloadSound() { return Set.of(ModSounds.MK_14_RELOAD_EMPTY.get(), ModSounds.MK_14_RELOAD_NORMAL.get()); @@ -188,4 +185,9 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return " MK-14"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java similarity index 93% rename from src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java index 1098f7c13..46351891b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -28,8 +29,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes; 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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -40,7 +39,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -76,7 +74,7 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -121,7 +119,7 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -161,11 +159,6 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { return map; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - @Override public Set getReloadSound() { return Set.of(ModSounds.QBZ_95_RELOAD_EMPTY.get(), ModSounds.QBZ_95_RELOAD_NORMAL.get()); @@ -191,4 +184,9 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return "QBZ-95-1"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java similarity index 92% rename from src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java rename to src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java index 1acc500cd..52d660847 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java @@ -1,4 +1,4 @@ -package net.mcreator.superbwarfare.item.gun; +package net.mcreator.superbwarfare.item.gun.rifle; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -8,14 +8,15 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; +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.tools.PoseTool; -import net.mcreator.superbwarfare.tools.TooltipTool; 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; @@ -25,8 +26,10 @@ import net.minecraft.world.entity.LivingEntity; 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.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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -37,7 +40,6 @@ 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.Set; import java.util.UUID; import java.util.function.Consumer; @@ -78,7 +80,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -115,7 +117,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { + private PlayState procedurePredicate(AnimationState event) { if (transformType != null && transformType.firstPerson()) { if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); @@ -155,11 +157,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { return map; } - @Override - public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { - TooltipTool.addGunTips(list, stack); - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.SKS.get()); GunsTool.initCreativeGun(stack, ModItems.SKS.getId().getPath()); @@ -180,4 +177,9 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { public String getGunDisplayName() { return " SKS"; } + + @Override + public boolean canApplyPerk(Perk perk) { + return PerkHelper.RIFLE_PERKS.test(perk); + } } \ No newline at end of file