diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index e242725e9..bf242922d 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.AK47ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -164,36 +164,13 @@ public class AK47Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.AK_47.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.AK_47.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); 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("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 4); - stack.getOrCreateTag().putDouble("recoilx", 0.0025); - stack.getOrCreateTag().putDouble("recoily", 0.012); - stack.getOrCreateTag().putDouble("damage", 8.5); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 30); - stack.getOrCreateTag().putDouble("mag", 30); - 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/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index ffd3d605c..1eb5408b8 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -6,7 +6,7 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Aa12ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; @@ -170,35 +170,12 @@ public class Aa12Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.AA_12.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.AA_12.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.95); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 3.5); - stack.getOrCreateTag().putDouble("shotgun", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.016); - stack.getOrCreateTag().putDouble("recoily", 0.007); - stack.getOrCreateTag().putDouble("damage", 1.5); - stack.getOrCreateTag().putDouble("headshot", 1.5); - stack.getOrCreateTag().putDouble("velocity", 16); - stack.getOrCreateTag().putDouble("mag", 25); - 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/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index 033aa9054..34611fd4e 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -6,7 +6,7 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.AbekiriItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -156,34 +156,12 @@ public class Abekiri extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.ABEKIRI.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.ABEKIRI.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.4); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("dev", 5); - stack.getOrCreateTag().putDouble("shotgun", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.005); - stack.getOrCreateTag().putDouble("recoily", 0.026); - stack.getOrCreateTag().putDouble("damage", 2.5); - stack.getOrCreateTag().putDouble("headshot", 1.5); - stack.getOrCreateTag().putDouble("velocity", 15); - stack.getOrCreateTag().putDouble("mag", 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/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index cd3ae7a5e..fe2f6c36d 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.BocekItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.BocekreloadProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -146,10 +146,6 @@ public class BocekItem extends GunItem implements GeoItem { itemstack.getOrCreateTag().putDouble("maxammo", getAmmoCount(player)); } BocekreloadProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static double getAmmoCount(Player player) { @@ -169,24 +165,8 @@ public class BocekItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.BOCEK.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.BOCEK.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1); - stack.getOrCreateTag().putDouble("zoom", 2); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 4); - stack.getOrCreateTag().putDouble("recoilx", 0.005); - stack.getOrCreateTag().putDouble("recoily", 0.003); - stack.getOrCreateTag().putDouble("headshot", 1.5); - stack.getOrCreateTag().putDouble("damage", 2.4); - 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/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 5984a8879..5b7148dc9 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.DevotionItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -155,38 +155,12 @@ public class Devotion extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.DEVOTION.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.DEVOTION.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.9); - stack.getOrCreateTag().putDouble("zoom", 2); - 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.0018); - stack.getOrCreateTag().putDouble("recoily", 0.01); - stack.getOrCreateTag().putDouble("damage", 7); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 40); - stack.getOrCreateTag().putDouble("mag", 55); - 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/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index fe0c51c88..c5e2f6292 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.gun; import net.mcreator.target.tools.GunsTool; +import net.mcreator.target.tools.ItemNBTTool; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; @@ -20,7 +21,12 @@ public class GunItem extends Item { } @Override - public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, int p_41407_, boolean p_41408_) { - GunsTool.pvpModeCheck(p_41404_, p_41405_); + public void inventoryTick(ItemStack itemstack, Level level, Entity entity, int slot, boolean selected) { + super.inventoryTick(itemstack, level, entity, slot, selected); + + if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { + GunsTool.initGun(level, itemstack, this.getDescriptionId().substring(this.getDescriptionId().lastIndexOf('.') + 1)); + } + GunsTool.pvpModeCheck(itemstack, level); } } 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 4c8146374..32ee6ff92 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.Hk416ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -164,35 +164,12 @@ public class Hk416Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.HK_416.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.3); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("rifle", 1); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 4); - stack.getOrCreateTag().putDouble("recoilx", 0.0016); - stack.getOrCreateTag().putDouble("recoily", 0.009); - stack.getOrCreateTag().putDouble("damage", 7.5); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 45); - stack.getOrCreateTag().putDouble("mag", 30); - 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/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index 5e8ab9c0e..9a65af2d1 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.HrrelodingProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -150,34 +150,12 @@ public class HuntingRifle extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); HrrelodingProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("sniperguns", 1); - stack.getOrCreateTag().putDouble("dev", 7); - stack.getOrCreateTag().putDouble("recoilx", 0.004); - stack.getOrCreateTag().putDouble("recoily", 0.03); - stack.getOrCreateTag().putDouble("damage", 40); - stack.getOrCreateTag().putDouble("headshot", 3); - stack.getOrCreateTag().putDouble("velocity", 50); - stack.getOrCreateTag().putDouble("mag", 1); - 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/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index c68ee605f..03d19125c 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -6,7 +6,7 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.KraberItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; @@ -153,10 +153,6 @@ public class Kraber extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } @Override @@ -173,27 +169,8 @@ public class Kraber extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.KRABER.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.KRABER.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.8); - stack.getOrCreateTag().putDouble("zoom", 3); - stack.getOrCreateTag().putDouble("sniperguns", 1); - stack.getOrCreateTag().putDouble("bipod", 1); - stack.getOrCreateTag().putDouble("dev", 6); - stack.getOrCreateTag().putDouble("recoilx", 0.008); - stack.getOrCreateTag().putDouble("recoily", 0.018); - stack.getOrCreateTag().putDouble("damage", 70); - stack.getOrCreateTag().putDouble("headshot", 3); - stack.getOrCreateTag().putDouble("velocity", 40); - stack.getOrCreateTag().putDouble("mag", 4); - 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/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index 84325e1d1..d39f68f01 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.M4ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -164,35 +164,12 @@ public class M4Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_4.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.M_4.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.15); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("rifle", 1); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 4); - stack.getOrCreateTag().putDouble("recoilx", 0.0015); - stack.getOrCreateTag().putDouble("recoily", 0.011); - stack.getOrCreateTag().putDouble("damage", 7); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 45); - stack.getOrCreateTag().putDouble("mag", 30); - 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/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index dae920175..17e7d4c5f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -6,7 +6,7 @@ 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.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -147,10 +147,6 @@ 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 @@ -177,30 +173,8 @@ public class M60Item extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_60.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.M_60.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); 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/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index d521fbf44..84669b832 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,10 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.mcreator.target.init.TargetModItems; import net.mcreator.target.client.renderer.item.M79ItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -154,10 +154,6 @@ public class M79Item extends GunItem implements GeoItem { itemstack.getOrCreateTag().putDouble("maxammo", getAmmoCount(player)); } M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static double getAmmoCount(Player player) { @@ -170,30 +166,15 @@ public class M79Item extends GunItem implements GeoItem { } return sum; } + protected static boolean check(ItemStack stack) { return stack.getItem() == TargetModItems.GRENADE_40MM.get(); } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_79.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.M_79.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.95); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("dev", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.004); - stack.getOrCreateTag().putDouble("recoily", 0.023); - stack.getOrCreateTag().putDouble("damage", 40); - stack.getOrCreateTag().putDouble("velocity", 3.75); - stack.getOrCreateTag().putDouble("mag", 1); - 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 597ff993f..a69ca1d6b 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -6,7 +6,7 @@ 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.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -152,10 +152,6 @@ 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 @@ -182,26 +178,8 @@ public class M870Item extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_870.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.M_870.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); 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/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index c439eac4a..3f971a544 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.M98bItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -160,34 +160,12 @@ public class M98bItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.M_98B.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.85); - stack.getOrCreateTag().putDouble("zoom", 4); - stack.getOrCreateTag().putDouble("sniperguns", 1); - stack.getOrCreateTag().putDouble("dev", 6); - stack.getOrCreateTag().putDouble("recoilx", 0.007); - stack.getOrCreateTag().putDouble("recoily", 0.013); - stack.getOrCreateTag().putDouble("damage", 28); - stack.getOrCreateTag().putDouble("headshot", 3); - stack.getOrCreateTag().putDouble("velocity", 55); - stack.getOrCreateTag().putDouble("mag", 5); - 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 6f457fdc8..09509c53e 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -6,7 +6,7 @@ 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.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -159,10 +159,6 @@ 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 @@ -189,26 +185,8 @@ public class MarlinItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MARLIN.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.MARLIN.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); 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/Minigun.java b/src/main/java/net/mcreator/target/item/gun/Minigun.java index 0819fb942..fe3eb83c3 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -6,8 +6,9 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.MinigunItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.MiniguninbackpackProcedure; -import net.mcreator.target.tools.RarityTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -181,36 +182,13 @@ public class Minigun extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); MiniguninbackpackProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MINIGUN.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.MINIGUN.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoom", 1); - stack.getOrCreateTag().putDouble("rifle", 1); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("mg", 1); - stack.getOrCreateTag().putDouble("dev", 5); - stack.getOrCreateTag().putDouble("recoilx", 0.024); - stack.getOrCreateTag().putDouble("recoily", 0.005); - stack.getOrCreateTag().putDouble("damage", 8); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 40); - 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/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index 350e723d0..9d2cd4bf4 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -6,7 +6,7 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Mk14ItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -143,10 +143,6 @@ public class Mk14Item extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } @Override @@ -173,28 +169,8 @@ public class Mk14Item extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.MK_14.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.MK_14.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.9); - stack.getOrCreateTag().putDouble("zoom", 3.4); - stack.getOrCreateTag().putDouble("rifle", 1); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 6); - stack.getOrCreateTag().putDouble("bipod", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.006); - stack.getOrCreateTag().putDouble("recoily", 0.014); - stack.getOrCreateTag().putDouble("damage", 12); - stack.getOrCreateTag().putDouble("headshot", 2.5); - stack.getOrCreateTag().putDouble("velocity", 45); - stack.getOrCreateTag().putDouble("mag", 20); - 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/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 1a9e09bb1..749c80e8a 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -1,51 +1,41 @@ package net.mcreator.target.item.gun; -import net.mcreator.target.TargetMod; -import net.mcreator.target.tools.ItemNBTTool; -import net.mcreator.target.tools.TooltipTool; -import software.bernie.geckolib.util.GeckoLibUtil; -import software.bernie.geckolib.core.object.PlayState; -import software.bernie.geckolib.core.animation.RawAnimation; -import software.bernie.geckolib.core.animation.AnimationState; -import software.bernie.geckolib.core.animation.AnimationController; -import software.bernie.geckolib.core.animation.AnimatableManager; -import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; -import software.bernie.geckolib.animatable.GeoItem; - -import net.minecraftforge.client.extensions.common.IClientItemExtensions; - -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.level.Level; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.Item; -import net.minecraft.world.entity.Entity; -import net.minecraft.network.chat.Component; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; -import net.minecraft.client.model.HumanoidModel; - -import net.mcreator.target.procedures.TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.client.renderer.item.RpgItemRenderer; -import net.mcreator.target.init.TargetModItems; - -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.Minecraft; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; +import net.mcreator.target.client.renderer.item.RpgItemRenderer; +import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.procedures.TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; +import net.mcreator.target.tools.GunsTool; +import net.mcreator.target.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.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; +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.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +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; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.animation.AnimationState; +import software.bernie.geckolib.core.animation.RawAnimation; +import software.bernie.geckolib.core.object.PlayState; +import software.bernie.geckolib.util.GeckoLibUtil; -import java.util.UUID; - -import java.util.function.Consumer; import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; public class RpgItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -167,10 +157,6 @@ public class RpgItem extends GunItem implements GeoItem { itemstack.getOrCreateTag().putDouble("maxammo", getAmmoCount(player)); } TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static double getAmmoCount(Player player) { @@ -190,23 +176,8 @@ public class RpgItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.RPG.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.RPG.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.77); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("dev", 5); - stack.getOrCreateTag().putDouble("recoilx", 0.008); - stack.getOrCreateTag().putDouble("recoily", 0.018); - stack.getOrCreateTag().putDouble("damage", 150); - stack.getOrCreateTag().putDouble("velocity", 5.75); - 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/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index 95ea20d15..49e4ab0dc 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -1,50 +1,40 @@ package net.mcreator.target.item.gun; -import net.mcreator.target.TargetMod; -import net.mcreator.target.init.TargetModItems; -import net.mcreator.target.tools.ItemNBTTool; -import net.mcreator.target.tools.TooltipTool; -import software.bernie.geckolib.util.GeckoLibUtil; -import software.bernie.geckolib.core.object.PlayState; -import software.bernie.geckolib.core.animation.RawAnimation; -import software.bernie.geckolib.core.animation.AnimationState; -import software.bernie.geckolib.core.animation.AnimationController; -import software.bernie.geckolib.core.animation.AnimatableManager; -import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; -import software.bernie.geckolib.animatable.GeoItem; - -import net.minecraftforge.client.extensions.common.IClientItemExtensions; - -import net.minecraft.world.level.Level; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.Item; -import net.minecraft.world.entity.Entity; -import net.minecraft.network.chat.Component; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; - -import net.minecraft.client.model.HumanoidModel; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.InteractionHand; -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.Minecraft; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; +import net.mcreator.target.client.renderer.item.RpkItemRenderer; +import net.mcreator.target.init.TargetModItems; +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; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; +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.entity.EquipmentSlot; +import net.minecraft.world.item.*; +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; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.animation.AnimationState; +import software.bernie.geckolib.core.animation.RawAnimation; +import software.bernie.geckolib.core.object.PlayState; +import software.bernie.geckolib.util.GeckoLibUtil; -import java.util.UUID; - -import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.client.renderer.item.RpkItemRenderer; - -import java.util.function.Consumer; import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; public class RpkItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -175,37 +165,12 @@ public class RpkItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.RPK.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.RPK.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.0); - 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.0035); - stack.getOrCreateTag().putDouble("recoily", 0.012); - stack.getOrCreateTag().putDouble("damage", 8.75); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 35); - stack.getOrCreateTag().putDouble("mag", 50); - 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/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index b6a10806d..d5cfee626 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -6,8 +6,9 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SentinelItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.RarityTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -170,10 +171,6 @@ public class SentinelItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } @Override @@ -200,26 +197,8 @@ public class SentinelItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SENTINEL.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.SENTINEL.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 0.95); - stack.getOrCreateTag().putDouble("zoom", 3); - stack.getOrCreateTag().putDouble("sniperguns", 1); - stack.getOrCreateTag().putDouble("dev", 6); - stack.getOrCreateTag().putDouble("recoilx", 0.007); - stack.getOrCreateTag().putDouble("recoily", 0.018); - stack.getOrCreateTag().putDouble("damage", 25); - stack.getOrCreateTag().putDouble("mag", 5); - stack.getOrCreateTag().putDouble("headshot", 3); - stack.getOrCreateTag().putDouble("velocity", 50); - 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/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 0f509cfce..41340f912 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -5,7 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.SksItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -156,34 +156,12 @@ public class SksItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SKS.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.SKS.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("rifle", 1); - stack.getOrCreateTag().putDouble("dev", 5); - stack.getOrCreateTag().putDouble("recoilx", 0.004); - stack.getOrCreateTag().putDouble("recoily", 0.015); - stack.getOrCreateTag().putDouble("damage", 9.5); - stack.getOrCreateTag().putDouble("headshot", 2); - stack.getOrCreateTag().putDouble("velocity", 40); - stack.getOrCreateTag().putDouble("mag", 20); - 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 6469dd52f..3c9eb3c7c 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -6,7 +6,7 @@ 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.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -136,10 +136,6 @@ 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 @@ -166,26 +162,8 @@ public class SvdItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SVD.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.SVD.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); 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/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 735b35fcf..26e817131 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -3,10 +3,10 @@ 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.init.TargetModItems; import net.mcreator.target.client.renderer.item.TaserItemRenderer; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.TasercooldownProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -156,10 +156,6 @@ public class Taser extends GunItem implements GeoItem { itemstack.getOrCreateTag().putDouble("maxammo", getAmmoCount(player)); } TasercooldownProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack); - } } public static double getAmmoCount(Player player) { @@ -180,19 +176,7 @@ public class Taser extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.TASER.get()); - initGun(stack); + //GunsTool.initGun(stack, TargetModItems.TASER.getId().getPath()); return stack; } - - private static void initGun(ItemStack stack) { - stack.getOrCreateTag().putDouble("dev", 2); - stack.getOrCreateTag().putDouble("recoilx", 0.0001); - stack.getOrCreateTag().putDouble("recoily", 0.002); - stack.getOrCreateTag().putDouble("zoomspeed", 2.0); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("damage", 5); - stack.getOrCreateTag().putDouble("velocity", 3); - stack.getOrCreateTag().putDouble("mag", 1); - stack.getOrCreateTag().putBoolean("init", true); - } } diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index 5c04a68bb..35d96ea19 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -7,7 +7,6 @@ import net.mcreator.target.client.renderer.item.TracheliumItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.ReloadingProcedure; import net.mcreator.target.tools.GunsTool; -import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.ChatFormatting; @@ -154,12 +153,6 @@ public class Trachelium extends GunItem implements GeoItem { // TODO 把这坨procedure删了 ReloadingProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } - - GunsTool.initGun(world, itemstack, TargetModItems.TRACHELIUM.getId().getPath()); } @Override @@ -172,26 +165,8 @@ public class Trachelium extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.TRACHELIUM.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.TRACHELIUM.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.7); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("dev", 3); - stack.getOrCreateTag().putDouble("handgun", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.005); - stack.getOrCreateTag().putDouble("recoily", 0.022); - stack.getOrCreateTag().putDouble("damage", 18); - stack.getOrCreateTag().putDouble("headshot", 1.5); - stack.getOrCreateTag().putDouble("velocity", 60); - 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/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index 1d990c5fb..1d735bd89 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -6,7 +6,7 @@ import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.VectorItemRenderer; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.procedures.VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -147,10 +147,6 @@ public class VectorItem extends GunItem implements GeoItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); - - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { - initGun(itemstack, false); - } } @Override @@ -177,27 +173,8 @@ public class VectorItem extends GunItem implements GeoItem { public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.VECTOR.get()); - - initGun(stack, true); + //GunsTool.initGun(stack, TargetModItems.VECTOR.getId().getPath()); + stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } - - private static void initGun(ItemStack stack, boolean isCreative) { - stack.getOrCreateTag().putDouble("zoomspeed", 1.6); - stack.getOrCreateTag().putDouble("zoom", 1.25); - stack.getOrCreateTag().putDouble("autorifle", 1); - stack.getOrCreateTag().putDouble("dev", 3.5); - stack.getOrCreateTag().putDouble("smg", 1); - stack.getOrCreateTag().putDouble("recoilx", 0.011); - stack.getOrCreateTag().putDouble("recoily", 0.004); - stack.getOrCreateTag().putDouble("damage", 4.5); - stack.getOrCreateTag().putDouble("headshot", 1.5); - stack.getOrCreateTag().putDouble("velocity", 22); - stack.getOrCreateTag().putDouble("mag", 33); - stack.getOrCreateTag().putBoolean("init", true); - - if (isCreative) { - stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); - } - } } diff --git a/src/main/java/net/mcreator/target/tools/GunsTool.java b/src/main/java/net/mcreator/target/tools/GunsTool.java index 5571d6006..1a89e1c19 100644 --- a/src/main/java/net/mcreator/target/tools/GunsTool.java +++ b/src/main/java/net/mcreator/target/tools/GunsTool.java @@ -1,30 +1,43 @@ package net.mcreator.target.tools; -import net.mcreator.target.TargetMod; +import com.google.gson.stream.JsonReader; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import java.io.InputStreamReader; +import java.util.HashMap; + public class GunsTool { - // TODO 通过配置json的方式来初始化枪械 - public static void initGun(Level level, ItemStack stack, String location) { - if (level.getServer() != null) { - return; - } + public static final HashMap> gunsData = new HashMap<>(); + public static void initJsonData(Level level) { var manager = level.getServer().getResourceManager(); - ResourceLocation resourceLocation = new ResourceLocation(TargetMod.MODID, "guns/" + location); - manager.getResource(resourceLocation).ifPresent( - resource -> { + for (var entry : manager.listResources("guns", file -> file.getPath().endsWith(".json")).entrySet()) { + var id = entry.getKey(); + var attribute = entry.getValue(); + try { + JsonReader reader = new JsonReader(new InputStreamReader(attribute.open())); + reader.beginObject(); + var map = new HashMap(); + while (reader.hasNext()) { + map.put(reader.nextName(), reader.nextDouble()); } - ); - - + var path = id.getPath(); + gunsData.put(path.substring(5, path.length() - 5), map); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + public static void initGun(Level level, ItemStack stack, String location) { + if (level.getServer() == null) return; + initJsonData(level); + gunsData.get(location).forEach((k, v) -> stack.getOrCreateTag().putDouble(k, v)); } public static void pvpModeCheck(ItemStack stack, Level level) {