From 049c34edd5a7727c2e11926a23870eece4aae772 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 10 May 2024 14:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=BA=86=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/target/event/GunEventHandler.java | 9 +++------ src/main/java/net/mcreator/target/item/gun/Devotion.java | 3 ++- .../java/net/mcreator/target/item/gun/Hk416Item.java | 7 ++++--- .../java/net/mcreator/target/item/gun/HuntingRifle.java | 7 ++++--- src/main/java/net/mcreator/target/item/gun/Kraber.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/M4Item.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/M60Item.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/M79Item.java | 7 ++++--- src/main/java/net/mcreator/target/item/gun/M870Item.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/M98bItem.java | 7 ++++--- .../java/net/mcreator/target/item/gun/MarlinItem.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/Minigun.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/Mk14Item.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/RpgItem.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/RpkItem.java | 4 ++-- .../java/net/mcreator/target/item/gun/SentinelItem.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/SksItem.java | 7 ++++--- src/main/java/net/mcreator/target/item/gun/SvdItem.java | 4 ++-- src/main/java/net/mcreator/target/item/gun/Taser.java | 4 ++-- .../java/net/mcreator/target/item/gun/VectorItem.java | 4 ++-- 20 files changed, 51 insertions(+), 48 deletions(-) diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 9af4bd237..0e977c689 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -6,7 +6,6 @@ import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModTags; import net.mcreator.target.network.TargetModVariables; -import net.mcreator.target.tools.ItemNBTTool; import net.minecraft.core.Holder; import net.minecraft.network.protocol.game.ClientboundSoundPacket; import net.minecraft.resources.ResourceLocation; @@ -110,16 +109,14 @@ public class GunEventHandler { if (stack.is(TargetModTags.Items.NORMAL_MAG_GUN)) { double mode = stack.getOrCreateTag().getDouble("firemode"); if (player.getPersistentData().getDouble("firing") == 0 && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) { - stack.getOrCreateTag().putDouble("fire_increase", 0); + stack.getOrCreateTag().putDouble("fire_increase", 0); } if (player.getPersistentData().getDouble("firing") == 1 && stack.getOrCreateTag().getDouble("reloading") == 0 && stack.getOrCreateTag().getDouble("ammo") > 0 && !player.getCooldowns().isOnCooldown(stack.getItem()) - && mode != 1 - && !player.getCooldowns().isOnCooldown(stack.getItem())) - { + && mode != 1) { if (stack.getOrCreateTag().getDouble("firemode") == 0) { player.getPersistentData().putDouble("firing", 0); @@ -149,7 +146,7 @@ public class GunEventHandler { } if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) { - stack.getOrCreateTag().putDouble("fire_increase", stack.getOrCreateTag().getDouble("fire_increase") + 0.334); + stack.getOrCreateTag().putDouble("fire_increase", stack.getOrCreateTag().getDouble("fire_increase") + 0.334); } int cooldown = (int) stack.getOrCreateTag().getDouble("fire_interval") + (int) stack.getOrCreateTag().getDouble("fire_sequence") - (int) stack.getOrCreateTag().getDouble("fire_increase"); diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index a22f74653..e8bff2924 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -2,6 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.DevotionItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; @@ -142,7 +143,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 6bfa93694..2facc733c 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Hk416ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -150,7 +152,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.035f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.035f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -168,8 +170,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); - //GunsTool.initGun(stack, TargetModItems.HK_416.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.HK_416.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index d45a63b79..f611bb3d3 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.HrrelodingProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -136,7 +138,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -154,8 +156,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get()); - //GunsTool.initGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index ff9652fb1..e3eb24431 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.KraberItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; @@ -169,8 +170,7 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.KRABER.get()); - //GunsTool.initGun(stack, TargetModItems.KRABER.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.KRABER.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index 57d3e9a48..e85024588 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M4ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -169,8 +170,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_4.get()); - //GunsTool.initGun(stack, TargetModItems.M_4.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.M_4.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index fbdf07ac5..71c0b542e 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M60ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -173,8 +174,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_60.get()); - //GunsTool.initGun(stack, TargetModItems.M_60.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.M_60.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index b8cbe8873..a0159ca18 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -137,7 +139,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -173,8 +175,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_79.get()); - //GunsTool.initGun(stack, TargetModItems.M_79.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.M_79.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index 954cf521c..271e53d71 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M870ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -178,8 +179,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_870.get()); - //GunsTool.initGun(stack, TargetModItems.M_870.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.M_870.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index 960eee6c1..f4b2dcda7 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M98bItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -151,7 +153,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -164,8 +166,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); - //GunsTool.initGun(stack, TargetModItems.M_98B.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.M_98B.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index f3b86540a..cda282874 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.MarlinItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -185,8 +186,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MARLIN.get()); - //GunsTool.initGun(stack, TargetModItems.MARLIN.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.MARLIN.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/Minigun.java b/src/main/java/net/mcreator/target/item/gun/Minigun.java index f96245486..adb31fd55 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.MinigunItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.MiniguninbackpackProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; @@ -186,8 +187,7 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MINIGUN.get()); - //GunsTool.initGun(stack, TargetModItems.MINIGUN.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.MINIGUN.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index 7e3deb2ed..c1e742c5a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.Mk14ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -169,8 +170,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MK_14.get()); - //GunsTool.initGun(stack, TargetModItems.MK_14.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.MK_14.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index d9a9d2883..6eead8e49 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.RpgItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -176,8 +177,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.RPG.get()); - //GunsTool.initGun(stack, TargetModItems.RPG.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.RPG.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index 55bfb57ec..3a4b6e340 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.RpkItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -169,8 +170,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.RPK.get()); - //GunsTool.initGun(stack, TargetModItems.RPK.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.RPK.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 6cc951250..f26ef8c4d 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.SentinelItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; @@ -197,8 +198,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SENTINEL.get()); - //GunsTool.initGun(stack, TargetModItems.SENTINEL.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.SENTINEL.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 1cbc5101d..b28838218 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -2,10 +2,12 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SksItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -142,7 +144,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } @@ -160,8 +162,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SKS.get()); - //GunsTool.initGun(stack, TargetModItems.SKS.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.SKS.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 30c34deb1..90771f561 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.SvdItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -162,8 +163,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SVD.get()); - //GunsTool.initGun(stack, TargetModItems.SVD.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.SVD.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 2d06ab25f..8b4605d24 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.TasercooldownProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -175,8 +176,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.TASER.get()); - - //GunsTool.initGun(stack, TargetModItems.TASER.getId().getPath()); + GunsTool.initCreativeGun(stack, TargetModItems.TASER.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index a703f0ad8..16ae696ac 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.VectorItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -173,8 +174,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.VECTOR.get()); - //GunsTool.initGun(stack, TargetModItems.VECTOR.getId().getPath()); - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + GunsTool.initCreativeGun(stack, TargetModItems.VECTOR.getId().getPath()); return stack; }