diff --git a/src/main/java/net/mcreator/target/init/TargetModTabs.java b/src/main/java/net/mcreator/target/init/TargetModTabs.java index 290578f5f..0323a8596 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModTabs.java @@ -28,7 +28,13 @@ public class TargetModTabs { output.accept(Trachelium.getGunInstance()); output.accept(VectorItem.getGunInstance()); + output.accept(MarlinItem.getGunInstance()); + output.accept(SvdItem.getGunInstance()); + + output.accept(M870Item.getGunInstance()); output.accept(Aa12Item.getGunInstance()); + + output.accept(M60Item.getGunInstance()); } ) .build()); 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 5427a41b2..dae920175 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -2,8 +2,11 @@ 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.M60ItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -144,6 +147,10 @@ public class M60Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); + + if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { + initGun(itemstack, false); + } } @Override @@ -163,8 +170,37 @@ public class M60Item extends GunItem implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.08f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.08f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } + + public static ItemStack getGunInstance() { + ItemStack stack = new ItemStack(TargetModItems.M_60.get()); + + initGun(stack, true); + return stack; + } + + private static void initGun(ItemStack stack, boolean isCreative) { + stack.getOrCreateTag().putDouble("zoomspeed", 0.85); + stack.getOrCreateTag().putDouble("zoom", 1.25); + stack.getOrCreateTag().putDouble("rifle", 1); + stack.getOrCreateTag().putDouble("autorifle", 1); + stack.getOrCreateTag().putDouble("mg", 1); + stack.getOrCreateTag().putDouble("dev", 5); + stack.getOrCreateTag().putDouble("bipod", 1); + stack.getOrCreateTag().putDouble("recoilx", 0.004); + stack.getOrCreateTag().putDouble("recoily", 0.014); + stack.getOrCreateTag().putDouble("damage", 9); + stack.getOrCreateTag().putDouble("headshot", 2); + stack.getOrCreateTag().putDouble("velocity", 40); + stack.getOrCreateTag().putDouble("mag", 100); + stack.getOrCreateTag().putDouble("firemode", 2); + stack.getOrCreateTag().putBoolean("init", true); + + if (isCreative) { + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + } + } } 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 795ecc569..597ff993f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -4,7 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M870ItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -150,6 +152,10 @@ public class M870Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); + + if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { + initGun(itemstack, false); + } } @Override @@ -173,4 +179,29 @@ public class M870Item extends GunItem implements GeoItem { } return map; } + + public static ItemStack getGunInstance() { + ItemStack stack = new ItemStack(TargetModItems.M_870.get()); + + initGun(stack, true); + return stack; + } + + private static void initGun(ItemStack stack, boolean isCreative) { + stack.getOrCreateTag().putDouble("zoomspeed", 1.1); + stack.getOrCreateTag().putDouble("zoom", 1.25); + stack.getOrCreateTag().putDouble("dev", 3); + stack.getOrCreateTag().putDouble("shotgun", 1); + stack.getOrCreateTag().putDouble("recoilx", 0.009); + stack.getOrCreateTag().putDouble("recoily", 0.03); + stack.getOrCreateTag().putDouble("damage", 2); + stack.getOrCreateTag().putDouble("headshot", 1.5); + stack.getOrCreateTag().putDouble("velocity", 20); + stack.getOrCreateTag().putDouble("mag", 8); + stack.getOrCreateTag().putBoolean("init", true); + + if (isCreative) { + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + } + } } 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 f4b4517c1..6f457fdc8 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -2,8 +2,11 @@ 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.MarlinItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -156,6 +159,10 @@ public class MarlinItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); + + if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { + initGun(itemstack, false); + } } @Override @@ -175,8 +182,33 @@ public class MarlinItem extends GunItem implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } + + public static ItemStack getGunInstance() { + ItemStack stack = new ItemStack(TargetModItems.MARLIN.get()); + + initGun(stack, true); + return stack; + } + + private static void initGun(ItemStack stack, boolean isCreative) { + stack.getOrCreateTag().putDouble("zoomspeed", 1.1); + stack.getOrCreateTag().putDouble("zoom", 1.25); + stack.getOrCreateTag().putDouble("rifle", 1); + stack.getOrCreateTag().putDouble("dev", 2); + stack.getOrCreateTag().putDouble("recoilx", 0.004); + stack.getOrCreateTag().putDouble("recoily", 0.011); + stack.getOrCreateTag().putDouble("damage", 16); + stack.getOrCreateTag().putDouble("headshot", 2.5); + stack.getOrCreateTag().putDouble("velocity", 27); + stack.getOrCreateTag().putDouble("mag", 8); + stack.getOrCreateTag().putBoolean("init", true); + + if (isCreative) { + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + } + } } 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 79d4f199a..6469dd52f 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -2,8 +2,11 @@ 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.SvdItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -133,6 +136,10 @@ public class SvdItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); + + if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { + initGun(itemstack, false); + } } @Override @@ -152,8 +159,33 @@ public class SvdItem extends GunItem implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } + + public static ItemStack getGunInstance() { + ItemStack stack = new ItemStack(TargetModItems.SVD.get()); + + initGun(stack, true); + return stack; + } + + private static void initGun(ItemStack stack, boolean isCreative) { + stack.getOrCreateTag().putDouble("zoomspeed", 0.9); + stack.getOrCreateTag().putDouble("zoom", 4); + stack.getOrCreateTag().putDouble("sniperguns", 1); + stack.getOrCreateTag().putDouble("dev", 6); + stack.getOrCreateTag().putDouble("recoilx", 0.008); + stack.getOrCreateTag().putDouble("recoily", 0.015); + stack.getOrCreateTag().putDouble("damage", 18); + stack.getOrCreateTag().putDouble("headshot", 2.5); + stack.getOrCreateTag().putDouble("velocity", 50); + stack.getOrCreateTag().putDouble("mag", 10); + stack.getOrCreateTag().putBoolean("init", true); + + if (isCreative) { + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); + } + } } diff --git a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java index 4e24467f6..6e924f24b 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java @@ -77,18 +77,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 55); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } -// if (itemstackiterator.getItem() == TargetModItems.TRACHELIUM.get()) { -// itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.7); -// itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); -// itemstackiterator.getOrCreateTag().putDouble("dev", 3); -// itemstackiterator.getOrCreateTag().putDouble("handgun", 1); -// itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.005); -// itemstackiterator.getOrCreateTag().putDouble("recoily", 0.022); -// itemstackiterator.getOrCreateTag().putDouble("damage", 18); -// itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); -// itemstackiterator.getOrCreateTag().putDouble("velocity", 60); -// itemstackiterator.getOrCreateTag().putDouble("mag", 8); -// } if (itemstackiterator.getItem() == TargetModItems.HUNTING_RIFLE.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); @@ -101,16 +89,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 50); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } -// if (itemstackiterator.getItem() == TargetModItems.TASER.get()) { -// itemstackiterator.getOrCreateTag().putDouble("dev", 2); -// itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.0001); -// itemstackiterator.getOrCreateTag().putDouble("recoily", 0.002); -// itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 2.0); -// itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); -// itemstackiterator.getOrCreateTag().putDouble("damage", 5); -// itemstackiterator.getOrCreateTag().putDouble("velocity", 3); -// itemstackiterator.getOrCreateTag().putDouble("mag", 1); -// } if (itemstackiterator.getItem() == TargetModItems.M_79.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); @@ -121,18 +99,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 3.75); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } -// if (itemstackiterator.getItem() == TargetModItems.ABEKIRI.get()) { -// itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.4); -// itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); -// itemstackiterator.getOrCreateTag().putDouble("dev", 5); -// itemstackiterator.getOrCreateTag().putDouble("shotgun", 1); -// itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.005); -// itemstackiterator.getOrCreateTag().putDouble("recoily", 0.026); -// itemstackiterator.getOrCreateTag().putDouble("damage", 2.5); -// itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); -// itemstackiterator.getOrCreateTag().putDouble("velocity", 15); -// itemstackiterator.getOrCreateTag().putDouble("mag", 2); -// } if (itemstackiterator.getItem() == TargetModItems.M_98B.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); itemstackiterator.getOrCreateTag().putDouble("zoom", 4); @@ -168,19 +134,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } -// if (itemstackiterator.getItem() == TargetModItems.AA_12.get()) { -// itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); -// itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); -// itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); -// itemstackiterator.getOrCreateTag().putDouble("dev", 3.5); -// itemstackiterator.getOrCreateTag().putDouble("shotgun", 1); -// itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.016); -// itemstackiterator.getOrCreateTag().putDouble("recoily", 0.007); -// itemstackiterator.getOrCreateTag().putDouble("damage", 1.5); -// itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); -// itemstackiterator.getOrCreateTag().putDouble("velocity", 16); -// itemstackiterator.getOrCreateTag().putDouble("mag", 25); -// } if (itemstackiterator.getItem() == TargetModItems.BOCEK.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 2); @@ -233,19 +186,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 40); itemstackiterator.getOrCreateTag().putDouble("mag", 4); } -// if (itemstackiterator.getItem() == TargetModItems.VECTOR.get()) { -// itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.6); -// itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); -// itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); -// itemstackiterator.getOrCreateTag().putDouble("dev", 3.5); -// itemstackiterator.getOrCreateTag().putDouble("smg", 1); -// itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.011); -// itemstackiterator.getOrCreateTag().putDouble("recoily", 0.004); -// itemstackiterator.getOrCreateTag().putDouble("damage", 4.5); -// itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); -// itemstackiterator.getOrCreateTag().putDouble("velocity", 22); -// itemstackiterator.getOrCreateTag().putDouble("mag", 33); -// } if (itemstackiterator.getItem() == TargetModItems.MINIGUN.get()) { itemstackiterator.getOrCreateTag().putDouble("zoom", 1); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -285,59 +225,6 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("headshot", 3); itemstackiterator.getOrCreateTag().putDouble("velocity", 50); } - if (itemstackiterator.getItem() == TargetModItems.M_60.get()) { - itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); - itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); - itemstackiterator.getOrCreateTag().putDouble("rifle", 1); - itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); - itemstackiterator.getOrCreateTag().putDouble("mg", 1); - itemstackiterator.getOrCreateTag().putDouble("dev", 5); - itemstackiterator.getOrCreateTag().putDouble("bipod", 1); - itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.004); - itemstackiterator.getOrCreateTag().putDouble("recoily", 0.014); - itemstackiterator.getOrCreateTag().putDouble("damage", 9); - itemstackiterator.getOrCreateTag().putDouble("headshot", 2); - itemstackiterator.getOrCreateTag().putDouble("velocity", 40); - itemstackiterator.getOrCreateTag().putDouble("mag", 100); - itemstackiterator.getOrCreateTag().putDouble("firemode", 2); - } - if (itemstackiterator.getItem() == TargetModItems.SVD.get()) { - itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); - itemstackiterator.getOrCreateTag().putDouble("zoom", 4); - itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); - itemstackiterator.getOrCreateTag().putDouble("dev", 6); - itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.008); - itemstackiterator.getOrCreateTag().putDouble("recoily", 0.015); - itemstackiterator.getOrCreateTag().putDouble("damage", 18); - itemstackiterator.getOrCreateTag().putDouble("headshot", 2.5); - itemstackiterator.getOrCreateTag().putDouble("velocity", 50); - itemstackiterator.getOrCreateTag().putDouble("mag", 10); - } - if (itemstackiterator.getItem() == TargetModItems.MARLIN.get()) { - itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); - itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); - itemstackiterator.getOrCreateTag().putDouble("rifle", 1); - itemstackiterator.getOrCreateTag().putDouble("dev", 2); - itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.004); - itemstackiterator.getOrCreateTag().putDouble("recoily", 0.011); - itemstackiterator.getOrCreateTag().putDouble("damage", 16); - itemstackiterator.getOrCreateTag().putDouble("headshot", 2.5); - itemstackiterator.getOrCreateTag().putDouble("velocity", 27); - itemstackiterator.getOrCreateTag().putDouble("mag", 8); - } - if (itemstackiterator.getItem() == TargetModItems.M_870.get()) { - itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); - itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); - itemstackiterator.getOrCreateTag().putDouble("dev", 3); - itemstackiterator.getOrCreateTag().putDouble("shotgun", 1); - itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.009); - itemstackiterator.getOrCreateTag().putDouble("recoily", 0.03); - itemstackiterator.getOrCreateTag().putDouble("damage", 2); - itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); - itemstackiterator.getOrCreateTag().putDouble("velocity", 20); - itemstackiterator.getOrCreateTag().putDouble("mag", 8); - } - } }