From 9b8983dc77c9a41b4c8b0d243acbbc58a82e33cb Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 6 May 2024 15:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/target/TargetMod.java | 2 +- .../target/init/TargetModGunTabs.java | 52 +++--- ...{ItemRegistry.java => TargetModItems.java} | 2 +- .../mcreator/target/init/TargetModTabs.java | 168 +++++++++--------- .../mcreator/target/init/TargetModTrades.java | 48 ++--- .../net/mcreator/target/item/gun/M79Item.java | 4 +- .../net/mcreator/target/item/gun/RpgItem.java | 4 +- .../net/mcreator/target/item/gun/Taser.java | 4 +- .../procedures/Aa12autofireProcedure.java | 6 +- .../procedures/Ak47autofireProcedure.java | 4 +- .../target/procedures/AmmocountProcedure.java | 6 +- .../target/procedures/BowlooseProcedure.java | 4 +- .../procedures/BulletFireNormalProcedure.java | 4 +- .../procedures/ChangefiremodeProcedure.java | 10 +- ...laymoreDangShiTiGengXinKeShiProcedure.java | 4 +- .../ClaymoreYouJiShiTiShiProcedure.java | 4 +- ...anJiaWanChengShiYongWuPinShiProcedure.java | 4 +- ...airXianShiYouXiNeiDieJiaCengProcedure.java | 4 +- .../procedures/DamageReduceProcedure.java | 8 +- .../procedures/DevotionAutofireProcedure.java | 14 +- .../procedures/DismantlePressProcedure.java | 18 +- .../target/procedures/GunsDataProcedure.java | 50 +++--- .../target/procedures/GunsTipsProcedure.java | 14 +- ...anJiaWanChengShiYongWuPinShiProcedure.java | 4 +- ...oYouJiKongQiShiShiTiDeWeiZhiProcedure.java | 4 +- .../procedures/Hk416firerandomProcedure.java | 8 +- .../procedures/M4firerandomProcedure.java | 8 +- .../procedures/M60autofireProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 6 +- ...9uiXianShiYouXiNeiDieJiaCengProcedure.java | 4 +- .../procedures/MarlinfireProcedure.java | 4 +- .../procedures/MinigunautofireProcedure.java | 6 +- .../MiniguninbackpackProcedure.java | 4 +- .../procedures/Mk14autofireProcedure.java | 4 +- ...rtarDangXiaoShiShiJianDaoShiProcedure.java | 8 +- .../target/procedures/PressFireProcedure.java | 8 +- ...lXiaoGuoChiXuShiMeiKeFaShengProcedure.java | 6 +- .../procedures/ReloadsoundstopProcedure.java | 6 +- .../procedures/RengchumortarProcedure.java | 2 +- ...anJiaWanChengShiYongWuPinShiProcedure.java | 4 +- ...oYouJiKongQiShiShiTiDeWeiZhiProcedure.java | 4 +- ...cketShiTiBeiGongJuJiZhongShiProcedure.java | 4 +- .../target/procedures/RpgemptyProcedure.java | 6 +- .../procedures/RpkautofireProcedure.java | 4 +- ...anJiaWanChengShiYongWuPinShiProcedure.java | 4 +- ...oYouJiKongQiShiShiTiDeWeiZhiProcedure.java | 4 +- ...anJiaWanChengShiYongWuPinShiProcedure.java | 4 +- ...oYouJiKongQiShiShiTiDeWeiZhiProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- .../Target1DangYouJiShiTiShiProcedure.java | 4 +- ...DangYouJianDianJiFangKuaiShiProcedure.java | 4 +- .../procedures/TasercooldownProcedure.java | 4 +- .../procedures/VecBurstFireProcedure.java | 4 +- .../procedures/VecautofireProcedure.java | 4 +- .../procedures/WeaponDrawProcedure.java | 6 +- ...base_plate.json => mortar_base_plate.json} | 2 +- .../{base_plate.png => mortar_base_plate.png} | Bin 57 files changed, 297 insertions(+), 297 deletions(-) rename src/main/java/net/mcreator/target/init/{ItemRegistry.java => TargetModItems.java} (99%) rename src/main/resources/assets/target/models/item/{moratr_base_plate.json => mortar_base_plate.json} (53%) rename src/main/resources/assets/target/textures/item/{base_plate.png => mortar_base_plate.png} (100%) diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index 10594eafb..cdf078469 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -35,7 +35,7 @@ public class TargetMod { TargetModSounds.REGISTRY.register(bus); TargetModBlocks.REGISTRY.register(bus); - ItemRegistry.ITEMS.register(bus); + TargetModItems.ITEMS.register(bus); TargetModEntities.REGISTRY.register(bus); TargetCustomModEntities.ENTITY_TYPES.register(bus); diff --git a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java b/src/main/java/net/mcreator/target/init/TargetModGunTabs.java index f8f5634b5..3a451c9f4 100644 --- a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModGunTabs.java @@ -17,31 +17,31 @@ public class TargetModGunTabs { public static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TargetMod.MODID); public static final RegistryObject TARGET_GUNS = REGISTRY.register("target_guns", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_guns")).icon(() -> new ItemStack(ItemRegistry.TASER.get())).displayItems((parameters, tabData) -> { - tabData.accept(ItemRegistry.TASER.get()); - tabData.accept(ItemRegistry.ABEKIRI.get()); - tabData.accept(ItemRegistry.TRACHELIUM.get()); - tabData.accept(ItemRegistry.VECTOR.get()); - tabData.accept(ItemRegistry.AK_47.get()); - tabData.accept(ItemRegistry.SKS.get()); - tabData.accept(ItemRegistry.M_4.get()); - tabData.accept(ItemRegistry.HK_416.get()); - tabData.accept(ItemRegistry.MK_14.get()); - tabData.accept(ItemRegistry.MARLIN.get()); - tabData.accept(ItemRegistry.SVD.get()); - tabData.accept(ItemRegistry.M_98B.get()); - tabData.accept(ItemRegistry.SENTINEL.get()); - tabData.accept(ItemRegistry.HUNTING_RIFLE.get()); - tabData.accept(ItemRegistry.KRABER.get()); - tabData.accept(ItemRegistry.M_870.get()); - tabData.accept(ItemRegistry.AA_12.get()); - tabData.accept(ItemRegistry.DEVOTION.get()); - tabData.accept(ItemRegistry.RPK.get()); - tabData.accept(ItemRegistry.M_60.get()); - tabData.accept(ItemRegistry.MINIGUN.get()); - tabData.accept(ItemRegistry.M_79.get()); - tabData.accept(ItemRegistry.RPG.get()); - tabData.accept(ItemRegistry.BOCEK.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_guns")).icon(() -> new ItemStack(TargetModItems.TASER.get())).displayItems((parameters, tabData) -> { + tabData.accept(TargetModItems.TASER.get()); + tabData.accept(TargetModItems.ABEKIRI.get()); + tabData.accept(TargetModItems.TRACHELIUM.get()); + tabData.accept(TargetModItems.VECTOR.get()); + tabData.accept(TargetModItems.AK_47.get()); + tabData.accept(TargetModItems.SKS.get()); + tabData.accept(TargetModItems.M_4.get()); + tabData.accept(TargetModItems.HK_416.get()); + tabData.accept(TargetModItems.MK_14.get()); + tabData.accept(TargetModItems.MARLIN.get()); + tabData.accept(TargetModItems.SVD.get()); + tabData.accept(TargetModItems.M_98B.get()); + tabData.accept(TargetModItems.SENTINEL.get()); + tabData.accept(TargetModItems.HUNTING_RIFLE.get()); + tabData.accept(TargetModItems.KRABER.get()); + tabData.accept(TargetModItems.M_870.get()); + tabData.accept(TargetModItems.AA_12.get()); + tabData.accept(TargetModItems.DEVOTION.get()); + tabData.accept(TargetModItems.RPK.get()); + tabData.accept(TargetModItems.M_60.get()); + tabData.accept(TargetModItems.MINIGUN.get()); + tabData.accept(TargetModItems.M_79.get()); + tabData.accept(TargetModItems.RPG.get()); + tabData.accept(TargetModItems.BOCEK.get()); }) .build()); @@ -49,7 +49,7 @@ public class TargetModGunTabs { public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(ItemRegistry.SENPAI_SPAWN_EGG.get()); + tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); } } } diff --git a/src/main/java/net/mcreator/target/init/ItemRegistry.java b/src/main/java/net/mcreator/target/init/TargetModItems.java similarity index 99% rename from src/main/java/net/mcreator/target/init/ItemRegistry.java rename to src/main/java/net/mcreator/target/init/TargetModItems.java index 0edc517c6..956b58ff3 100644 --- a/src/main/java/net/mcreator/target/init/ItemRegistry.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -17,7 +17,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class ItemRegistry { +public class TargetModItems { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); /** diff --git a/src/main/java/net/mcreator/target/init/TargetModTabs.java b/src/main/java/net/mcreator/target/init/TargetModTabs.java index f1e24bba1..2e62bdfc2 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModTabs.java @@ -20,101 +20,101 @@ import net.minecraftforge.registries.RegistryObject; public class TargetModTabs { public static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TargetMod.MODID); public static final RegistryObject TARGET_ITEM = REGISTRY.register("target_item", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_item")).icon(() -> new ItemStack(ItemRegistry.TARGET_DEPLOYER.get())).displayItems((parameters, tabData) -> { - tabData.accept(ItemRegistry.TARGET_DEPLOYER.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_item")).icon(() -> new ItemStack(TargetModItems.TARGET_DEPLOYER.get())).displayItems((parameters, tabData) -> { + tabData.accept(TargetModItems.TARGET_DEPLOYER.get()); tabData.accept(TargetModBlocks.SANDBAG.get().asItem()); tabData.accept(TargetModBlocks.BARBED_WIRE.get().asItem()); - tabData.accept(ItemRegistry.CLAYMORE_MINE.get()); + tabData.accept(TargetModItems.CLAYMORE_MINE.get()); tabData.accept(TargetModBlocks.JUMPPAD_BLOCK.get().asItem()); - tabData.accept(ItemRegistry.LIGHT_SABER.get()); - tabData.accept(ItemRegistry.HAMMER.get()); - tabData.accept(ItemRegistry.MORTAR_DEPLOYER.get()); - tabData.accept(ItemRegistry.MORTAR_BARREL.get()); - tabData.accept(ItemRegistry.MORTAR_BASE_PLATE.get()); - tabData.accept(ItemRegistry.MORTAR_BIPOD.get()); - tabData.accept(ItemRegistry.FUSEE.get()); - tabData.accept(ItemRegistry.SOUL_STEEL_NUGGET.get()); - tabData.accept(ItemRegistry.COPPERPLATE.get()); - tabData.accept(ItemRegistry.INGOT_STEEL.get()); - tabData.accept(ItemRegistry.LEAD_INGOT.get()); - tabData.accept(ItemRegistry.TUNGSTEN_INGOT.get()); - tabData.accept(ItemRegistry.CEMENTED_CARBIDE_INGOT.get()); - tabData.accept(ItemRegistry.SOUL_STEEL_INGOT.get()); - tabData.accept(ItemRegistry.IRON_POWDER.get()); - tabData.accept(ItemRegistry.TUNGSTEN_POWDER.get()); - tabData.accept(ItemRegistry.COAL_POWDER.get()); - tabData.accept(ItemRegistry.COAL_IRON_POWDER.get()); - tabData.accept(ItemRegistry.RAW_CEMENTED_CARBIDE_POWDER.get()); + tabData.accept(TargetModItems.LIGHT_SABER.get()); + tabData.accept(TargetModItems.HAMMER.get()); + tabData.accept(TargetModItems.MORTAR_DEPLOYER.get()); + tabData.accept(TargetModItems.MORTAR_BARREL.get()); + tabData.accept(TargetModItems.MORTAR_BASE_PLATE.get()); + tabData.accept(TargetModItems.MORTAR_BIPOD.get()); + tabData.accept(TargetModItems.FUSEE.get()); + tabData.accept(TargetModItems.SOUL_STEEL_NUGGET.get()); + tabData.accept(TargetModItems.COPPERPLATE.get()); + tabData.accept(TargetModItems.INGOT_STEEL.get()); + tabData.accept(TargetModItems.LEAD_INGOT.get()); + tabData.accept(TargetModItems.TUNGSTEN_INGOT.get()); + tabData.accept(TargetModItems.CEMENTED_CARBIDE_INGOT.get()); + tabData.accept(TargetModItems.SOUL_STEEL_INGOT.get()); + tabData.accept(TargetModItems.IRON_POWDER.get()); + tabData.accept(TargetModItems.TUNGSTEN_POWDER.get()); + tabData.accept(TargetModItems.COAL_POWDER.get()); + tabData.accept(TargetModItems.COAL_IRON_POWDER.get()); + tabData.accept(TargetModItems.RAW_CEMENTED_CARBIDE_POWDER.get()); tabData.accept(TargetModBlocks.GALENA_ORE.get().asItem()); tabData.accept(TargetModBlocks.DEEPSLATE_GALENA_ORE.get().asItem()); tabData.accept(TargetModBlocks.SCHEELITE_ORE.get().asItem()); tabData.accept(TargetModBlocks.DEEPSLATE_SCHEELITE_ORE.get().asItem()); - tabData.accept(ItemRegistry.GALENA.get()); - tabData.accept(ItemRegistry.SCHEELITE.get()); - tabData.accept(ItemRegistry.BUCKSHOT.get()); - tabData.accept(ItemRegistry.IRON_BARREL.get()); - tabData.accept(ItemRegistry.IRON_ACTION.get()); - tabData.accept(ItemRegistry.IRON_TRIGGER.get()); - tabData.accept(ItemRegistry.IRON_SPRING.get()); - tabData.accept(ItemRegistry.STEEL_BARREL.get()); - tabData.accept(ItemRegistry.STEEL_ACTION.get()); - tabData.accept(ItemRegistry.STEEL_TRIGGER.get()); - tabData.accept(ItemRegistry.STEEL_SPRING.get()); - tabData.accept(ItemRegistry.CEMENTED_CARBIDE_BARREL.get()); - tabData.accept(ItemRegistry.CEMENTED_CARBIDE_ACTION.get()); - tabData.accept(ItemRegistry.CEMENTED_CARBIDE_TRIGGER.get()); - tabData.accept(ItemRegistry.CEMENTED_CARBIDE_SPRING.get()); - tabData.accept(ItemRegistry.NETHERITE_BARREL.get()); - tabData.accept(ItemRegistry.NETHERITE_ACTION.get()); - tabData.accept(ItemRegistry.NETHERITE_TRIGGER.get()); - tabData.accept(ItemRegistry.NETHERITE_SPRING.get()); - tabData.accept(ItemRegistry.COMMON_MATERIAL_PACK.get()); - tabData.accept(ItemRegistry.RARE_MATERIAL_PACK.get()); - tabData.accept(ItemRegistry.EPIC_MATERIAL_PACK.get()); - tabData.accept(ItemRegistry.LEGENDARY_MATERIAL_PACK.get()); - tabData.accept(ItemRegistry.SPECIAL_MATERIAL_PACK.get()); - tabData.accept(ItemRegistry.TRACHELIUM_BLUEPRINT.get()); - tabData.accept(ItemRegistry.HUNTING_RIFLE_BLUEPRINT.get()); - tabData.accept(ItemRegistry.M_79_BLUEPRINT.get()); - tabData.accept(ItemRegistry.RPG_BLUEPRINT.get()); - tabData.accept(ItemRegistry.BOCEK_BLUEPRINT.get()); - tabData.accept(ItemRegistry.M_4_BLUEPRINT.get()); - tabData.accept(ItemRegistry.AA_12_BLUEPRINT.get()); - tabData.accept(ItemRegistry.HK_416_BLUEPRINT.get()); - tabData.accept(ItemRegistry.RPK_BLUEPRINT.get()); - tabData.accept(ItemRegistry.SKS_BLUEPRINT.get()); - tabData.accept(ItemRegistry.KRABER_BLUEPRINT.get()); - tabData.accept(ItemRegistry.VECTOR_BLUEPRINT.get()); - tabData.accept(ItemRegistry.MINIGUN_BLUEPRINT.get()); - tabData.accept(ItemRegistry.MK_14_BLUEPRINT.get()); - tabData.accept(ItemRegistry.SENTINEL_BLUEPRINT.get()); - tabData.accept(ItemRegistry.M_60_BLUEPRINT.get()); - tabData.accept(ItemRegistry.SVD_BLUEPRINT.get()); - tabData.accept(ItemRegistry.MARLIN_BLUEPRINT.get()); - tabData.accept(ItemRegistry.M_870_BLUEPRINT.get()); - tabData.accept(ItemRegistry.M_98B_BLUEPRINT.get()); - tabData.accept(ItemRegistry.AK_47_BLUEPRINT.get()); - tabData.accept(ItemRegistry.DEVOTION_BLUEPRINT.get()); - tabData.accept(ItemRegistry.TASER_BLUEPRINT.get()); + tabData.accept(TargetModItems.GALENA.get()); + tabData.accept(TargetModItems.SCHEELITE.get()); + tabData.accept(TargetModItems.BUCKSHOT.get()); + tabData.accept(TargetModItems.IRON_BARREL.get()); + tabData.accept(TargetModItems.IRON_ACTION.get()); + tabData.accept(TargetModItems.IRON_TRIGGER.get()); + tabData.accept(TargetModItems.IRON_SPRING.get()); + tabData.accept(TargetModItems.STEEL_BARREL.get()); + tabData.accept(TargetModItems.STEEL_ACTION.get()); + tabData.accept(TargetModItems.STEEL_TRIGGER.get()); + tabData.accept(TargetModItems.STEEL_SPRING.get()); + tabData.accept(TargetModItems.CEMENTED_CARBIDE_BARREL.get()); + tabData.accept(TargetModItems.CEMENTED_CARBIDE_ACTION.get()); + tabData.accept(TargetModItems.CEMENTED_CARBIDE_TRIGGER.get()); + tabData.accept(TargetModItems.CEMENTED_CARBIDE_SPRING.get()); + tabData.accept(TargetModItems.NETHERITE_BARREL.get()); + tabData.accept(TargetModItems.NETHERITE_ACTION.get()); + tabData.accept(TargetModItems.NETHERITE_TRIGGER.get()); + tabData.accept(TargetModItems.NETHERITE_SPRING.get()); + tabData.accept(TargetModItems.COMMON_MATERIAL_PACK.get()); + tabData.accept(TargetModItems.RARE_MATERIAL_PACK.get()); + tabData.accept(TargetModItems.EPIC_MATERIAL_PACK.get()); + tabData.accept(TargetModItems.LEGENDARY_MATERIAL_PACK.get()); + tabData.accept(TargetModItems.SPECIAL_MATERIAL_PACK.get()); + tabData.accept(TargetModItems.TRACHELIUM_BLUEPRINT.get()); + tabData.accept(TargetModItems.HUNTING_RIFLE_BLUEPRINT.get()); + tabData.accept(TargetModItems.M_79_BLUEPRINT.get()); + tabData.accept(TargetModItems.RPG_BLUEPRINT.get()); + tabData.accept(TargetModItems.BOCEK_BLUEPRINT.get()); + tabData.accept(TargetModItems.M_4_BLUEPRINT.get()); + tabData.accept(TargetModItems.AA_12_BLUEPRINT.get()); + tabData.accept(TargetModItems.HK_416_BLUEPRINT.get()); + tabData.accept(TargetModItems.RPK_BLUEPRINT.get()); + tabData.accept(TargetModItems.SKS_BLUEPRINT.get()); + tabData.accept(TargetModItems.KRABER_BLUEPRINT.get()); + tabData.accept(TargetModItems.VECTOR_BLUEPRINT.get()); + tabData.accept(TargetModItems.MINIGUN_BLUEPRINT.get()); + tabData.accept(TargetModItems.MK_14_BLUEPRINT.get()); + tabData.accept(TargetModItems.SENTINEL_BLUEPRINT.get()); + tabData.accept(TargetModItems.M_60_BLUEPRINT.get()); + tabData.accept(TargetModItems.SVD_BLUEPRINT.get()); + tabData.accept(TargetModItems.MARLIN_BLUEPRINT.get()); + tabData.accept(TargetModItems.M_870_BLUEPRINT.get()); + tabData.accept(TargetModItems.M_98B_BLUEPRINT.get()); + tabData.accept(TargetModItems.AK_47_BLUEPRINT.get()); + tabData.accept(TargetModItems.DEVOTION_BLUEPRINT.get()); + tabData.accept(TargetModItems.TASER_BLUEPRINT.get()); tabData.accept(TargetModBlocks.GUN_RECYCLE.get().asItem()); }) .build()); public static final RegistryObject AMMO = REGISTRY.register("ammo", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.ammo")).icon(() -> new ItemStack(ItemRegistry.SHOTGUN_AMMO_BOX.get())).displayItems((parameters, tabData) -> { - tabData.accept(ItemRegistry.HANDGUN_AMMO.get()); - tabData.accept(ItemRegistry.RIFLE_AMMO.get()); - tabData.accept(ItemRegistry.SNIPER_AMMO.get()); - tabData.accept(ItemRegistry.SHOTGUN_AMMO.get()); - tabData.accept(ItemRegistry.HANDGUN_AMMO_BOX.get()); - tabData.accept(ItemRegistry.RIFLE_AMMO_BOX.get()); - tabData.accept(ItemRegistry.SNIPER_AMMO_BOX.get()); - tabData.accept(ItemRegistry.SHOTGUN_AMMO_BOX.get()); - tabData.accept(ItemRegistry.CREATIVE_AMMO_BOX.get()); - tabData.accept(ItemRegistry.TASER_ELECTRODE.get()); - tabData.accept(ItemRegistry.GRENADE_40MM.get()); - tabData.accept(ItemRegistry.MORTAR_SHELLS.get()); - tabData.accept(ItemRegistry.ROCKET.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.ammo")).icon(() -> new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get())).displayItems((parameters, tabData) -> { + tabData.accept(TargetModItems.HANDGUN_AMMO.get()); + tabData.accept(TargetModItems.RIFLE_AMMO.get()); + tabData.accept(TargetModItems.SNIPER_AMMO.get()); + tabData.accept(TargetModItems.SHOTGUN_AMMO.get()); + tabData.accept(TargetModItems.HANDGUN_AMMO_BOX.get()); + tabData.accept(TargetModItems.RIFLE_AMMO_BOX.get()); + tabData.accept(TargetModItems.SNIPER_AMMO_BOX.get()); + tabData.accept(TargetModItems.SHOTGUN_AMMO_BOX.get()); + tabData.accept(TargetModItems.CREATIVE_AMMO_BOX.get()); + tabData.accept(TargetModItems.TASER_ELECTRODE.get()); + tabData.accept(TargetModItems.GRENADE_40MM.get()); + tabData.accept(TargetModItems.MORTAR_SHELLS.get()); + tabData.accept(TargetModItems.ROCKET.get()); }) .build()); @@ -123,7 +123,7 @@ public class TargetModTabs { public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(ItemRegistry.SENPAI_SPAWN_EGG.get()); + tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); } } } diff --git a/src/main/java/net/mcreator/target/init/TargetModTrades.java b/src/main/java/net/mcreator/target/init/TargetModTrades.java index 17951122c..da37f201a 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTrades.java +++ b/src/main/java/net/mcreator/target/init/TargetModTrades.java @@ -17,78 +17,78 @@ public class TargetModTrades { @SubscribeEvent public static void registerTrades(VillagerTradesEvent event) { if (event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(new BasicItemListing(new ItemStack(ItemRegistry.TASER_BLUEPRINT.get()), + event.getTrades().get(1).add(new BasicItemListing(new ItemStack(TargetModItems.TASER_BLUEPRINT.get()), new ItemStack(Items.EMERALD), 16, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 10), - new ItemStack(ItemRegistry.STEEL_ACTION.get()), 12, 5, 0.05f)); + new ItemStack(TargetModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ItemRegistry.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(TargetModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ItemRegistry.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(TargetModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ItemRegistry.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(TargetModItems.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ItemRegistry.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(TargetModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ItemRegistry.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD), - new ItemStack(ItemRegistry.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(TargetModItems.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(ItemRegistry.STEEL_BARREL.get()), 12, 5, 0.05f)); + new ItemStack(TargetModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 6), - new ItemStack(ItemRegistry.STEEL_TRIGGER.get()), 12, 5, 0.05f)); + new ItemStack(TargetModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(ItemRegistry.STEEL_SPRING.get()), 12, 5, 0.05f)); + new ItemStack(TargetModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(ItemRegistry.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); + new ItemStack(TargetModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), - new ItemStack(ItemRegistry.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); + new ItemStack(TargetModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(ItemRegistry.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); + new ItemStack(TargetModItems.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), - new ItemStack(ItemRegistry.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); + new ItemStack(TargetModItems.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); } } } 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 51dfe8961..5f94efb3b 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -2,7 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.minecraft.client.Minecraft; @@ -166,6 +166,6 @@ public class M79Item extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == ItemRegistry.GRENADE_40MM.get(); + return stack.getItem() == TargetModItems.GRENADE_40MM.get(); } } 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 c145ab1be..b36c28302 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -27,7 +27,7 @@ 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.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.Minecraft; @@ -178,6 +178,6 @@ public class RpgItem extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == ItemRegistry.ROCKET.get(); + return stack.getItem() == TargetModItems.ROCKET.get(); } } 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 3af7be569..f099e1716 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -2,7 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.procedures.TasercooldownProcedure; import net.minecraft.client.Minecraft; @@ -167,6 +167,6 @@ public class Taser extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == ItemRegistry.TASER_ELECTRODE.get(); + return stack.getItem() == TargetModItems.TASER_ELECTRODE.get(); } } diff --git a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java index c135bc9ec..02b1e39ee 100644 --- a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Aa12autofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 2) { - if (usehand.getItem() == ItemRegistry.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { for (int index0 = 0; index0 < 8; index0++) { BulletFireNormalProcedure.execute(entity); @@ -65,7 +65,7 @@ public class Aa12autofireProcedure { } } else if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 0) { entity.getPersistentData().putDouble("firing", 0); - if (usehand.getItem() == ItemRegistry.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck20 && _plrCldCheck20.getCooldowns().isOnCooldown(usehand.getItem()))) { for (int index1 = 0; index1 < 8; index1++) { BulletFireNormalProcedure.execute(entity); diff --git a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java index 5d127c4f1..737d2cae0 100644 --- a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Ak47autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.AK_47.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.AK_47.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { usehand.getOrCreateTag().putDouble("firecooldown", 7); if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java b/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java index 4692dcf3c..cbbfa7be5 100644 --- a/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -36,10 +36,10 @@ public class AmmocountProcedure { } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("firemode") == 0) { firemode = "Semi"; } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) { return (new java.text.DecimalFormat("##").format((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo"))) + " " + firemode; } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get()) { return new java.text.DecimalFormat("##").format((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo) + " " + firemode; } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("rifle") == 1) { diff --git a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java index b79b9adbe..c4d198822 100644 --- a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java @@ -3,7 +3,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.BocekarrowEntity; import net.mcreator.target.entity.ProjectileEntity; import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -29,7 +29,7 @@ public class BowlooseProcedure { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:bowpull1p"); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") >= 6) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("speed", ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power"))); diff --git a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java index 5c3a8aa8a..99ea9cc16 100644 --- a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java @@ -2,7 +2,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.ProjectileEntity; import net.mcreator.target.init.TargetModAttributes; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -36,7 +36,7 @@ public class BulletFireNormalProcedure { if (!entity.level().isClientSide() && entity instanceof LivingEntity living) { float damage; - if (heldItem.getItem() == ItemRegistry.BOCEK.get()) { + if (heldItem.getItem() == TargetModItems.BOCEK.get()) { damage = (float) heldItem.getOrCreateTag().getDouble("speed") * (float) heldItem.getOrCreateTag().getDouble("damageadd"); } else { damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("adddamage")) diff --git a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java index 537018a48..fc64eec67 100644 --- a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; @@ -18,8 +18,8 @@ public class ChangefiremodeProcedure { return; ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.getItem() == ItemRegistry.AK_47.get() || usehand.getItem() == ItemRegistry.M_4.get() || usehand.getItem() == ItemRegistry.AA_12.get() || usehand.getItem() == ItemRegistry.HK_416.get() - || usehand.getItem() == ItemRegistry.RPK.get() || usehand.getItem() == ItemRegistry.MK_14.get()) { + if (usehand.getItem() == TargetModItems.AK_47.get() || usehand.getItem() == TargetModItems.M_4.get() || usehand.getItem() == TargetModItems.AA_12.get() || usehand.getItem() == TargetModItems.HK_416.get() + || usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK_14.get()) { if (usehand.getOrCreateTag().getDouble("firemode") == 2) { usehand.getOrCreateTag().putDouble("firemode", 0); usehand.getOrCreateTag().putDouble("cg", 10); @@ -45,7 +45,7 @@ public class ChangefiremodeProcedure { _player.displayClientMessage(Component.literal("Auto"), true); } } - if (usehand.getItem() == ItemRegistry.VECTOR.get()) { + if (usehand.getItem() == TargetModItems.VECTOR.get()) { if (usehand.getOrCreateTag().getDouble("firemode") == 0) { usehand.getOrCreateTag().putDouble("firemode", 1); usehand.getOrCreateTag().putDouble("cg", 10); @@ -82,7 +82,7 @@ public class ChangefiremodeProcedure { _player.displayClientMessage(Component.literal("Semi"), true); } } - if (usehand.getItem() == ItemRegistry.SENTINEL.get() && !(entity instanceof Player _plrCldCheck36 && _plrCldCheck36.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("charging") == 0) { + if (usehand.getItem() == TargetModItems.SENTINEL.get() && !(entity instanceof Player _plrCldCheck36 && _plrCldCheck36.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("charging") == 0) { usehand.getOrCreateTag().putDouble("charging", 1); usehand.getOrCreateTag().putDouble("cid", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); usehand.getOrCreateTag().putDouble("chargingtime", 128); diff --git a/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java index c4d9f8bee..7756a10d5 100644 --- a/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java @@ -3,7 +3,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.TargetMod; import net.mcreator.target.entity.ClaymoreEntity; import net.mcreator.target.entity.Target1Entity; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; @@ -52,7 +52,7 @@ public class ClaymoreDangShiTiGengXinKeShiProcedure { } } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, y, z, new ItemStack(ItemRegistry.CLAYMORE_MINE.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, y, z, new ItemStack(TargetModItems.CLAYMORE_MINE.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } diff --git a/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java index 40b32cb55..332d53266 100644 --- a/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.TamableAnimal; @@ -16,7 +16,7 @@ public class ClaymoreYouJiShiTiShiProcedure { if (!entity.level().isClientSide()) entity.discard(); if (sourceentity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.CLAYMORE_MINE.get()); + ItemStack _setstack = new ItemStack(TargetModItems.CLAYMORE_MINE.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index e90e44fe7..35e0b6c9a 100644 --- a/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.CREATIVE_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.CREATIVE_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java index dc8b66547..38d2d086d 100644 --- a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,6 +14,6 @@ public class CrosshairXianShiYouXiNeiDieJiaCengProcedure { if (entity == null) return false; return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) && entity.getPersistentData().getDouble("miaozhunshijian") < 7 - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; } } diff --git a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java index c71982d09..8cf06b420 100644 --- a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -42,8 +42,8 @@ public class DamageReduceProcedure { } if (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) { stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get() - || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.RPG.get()) { + if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() + || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get()) { damage = amount; stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); } @@ -51,7 +51,7 @@ public class DamageReduceProcedure { if (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:gunfire")))) { stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); distanse = (entity.position()).distanceTo((sourceentity.position())); - if (stack.getOrCreateTag().getDouble("shotgun") == 1 || stack.getItem() == ItemRegistry.BOCEK.get()) { + if (stack.getOrCreateTag().getDouble("shotgun") == 1 || stack.getItem() == TargetModItems.BOCEK.get()) { if (distanse > 20) { ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.05 * (distanse - 20))))); damage = amount / (1 + 0.05 * (distanse - 20)); diff --git a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java index 2a0f04af1..fb079a220 100644 --- a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -37,22 +37,22 @@ public class DevotionAutofireProcedure { } } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 1) { + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 1) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 5) { + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 5) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 9) { + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 9) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 12) { + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 12) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 15) { + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 15) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && (entity.getPersistentData().getDouble("dvfire") == 17 || entity.getPersistentData().getDouble("dvfire") == 18 || entity.getPersistentData().getDouble("dvfire") == 19)) { DevofireProcedure.execute(entity); } diff --git a/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java b/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java index 7ba2a5c2b..4f6809af5 100644 --- a/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.Entity; @@ -30,14 +30,14 @@ public class DismantlePressProcedure { } if (stack.getRarity() == Rarity.RARE) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.INGOT_STEEL.get()); + ItemStack _setstack = new ItemStack(TargetModItems.INGOT_STEEL.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (stack.getRarity() == Rarity.EPIC) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.CEMENTED_CARBIDE_INGOT.get()); + ItemStack _setstack = new ItemStack(TargetModItems.CEMENTED_CARBIDE_INGOT.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } @@ -51,7 +51,7 @@ public class DismantlePressProcedure { } if (stack.is(ItemTags.create(new ResourceLocation("target:special_gun")))) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_INGOT.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_INGOT.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } @@ -59,34 +59,34 @@ public class DismantlePressProcedure { if (stack.getOrCreateTag().getDouble("level") >= 10) { if (Math.random() < 0.005 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get()); _setstack.setCount(3); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.01 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get()); _setstack.setCount(2); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.03 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.06 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); + ItemStack _setstack = new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java index ee77f3955..1704fd109 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.Entity; @@ -40,7 +40,7 @@ public class GunsDataProcedure { } else { itemstackiterator.getOrCreateTag().putDouble("damageadd", 1); } - if (itemstackiterator.getItem() == ItemRegistry.SKS.get()) { + if (itemstackiterator.getItem() == TargetModItems.SKS.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -53,7 +53,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 20); } - if (itemstackiterator.getItem() == ItemRegistry.AK_47.get()) { + if (itemstackiterator.getItem() == TargetModItems.AK_47.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -66,7 +66,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 30); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == ItemRegistry.DEVOTION.get()) { + if (itemstackiterator.getItem() == TargetModItems.DEVOTION.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 2); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -82,7 +82,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 55); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == ItemRegistry.TRACHELIUM.get()) { + if (itemstackiterator.getItem() == TargetModItems.TRACHELIUM.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.7); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 3); @@ -95,7 +95,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 8); } - if (itemstackiterator.getItem() == ItemRegistry.HUNTING_RIFLE.get()) { + if (itemstackiterator.getItem() == TargetModItems.HUNTING_RIFLE.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -107,7 +107,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 50); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == ItemRegistry.TASER.get()) { + if (itemstackiterator.getItem() == TargetModItems.TASER.get()) { itemstackiterator.getOrCreateTag().putDouble("dev", 2); itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.0001); itemstackiterator.getOrCreateTag().putDouble("recoily", 0.002); @@ -117,7 +117,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 3); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == ItemRegistry.M_79.get()) { + if (itemstackiterator.getItem() == TargetModItems.M_79.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 1); @@ -127,7 +127,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 3.75); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == ItemRegistry.ABEKIRI.get()) { + if (itemstackiterator.getItem() == TargetModItems.ABEKIRI.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.4); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 5); @@ -139,7 +139,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 15); itemstackiterator.getOrCreateTag().putDouble("mag", 2); } - if (itemstackiterator.getItem() == ItemRegistry.M_98B.get()) { + if (itemstackiterator.getItem() == TargetModItems.M_98B.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); itemstackiterator.getOrCreateTag().putDouble("zoom", 4); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -151,7 +151,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 55); itemstackiterator.getOrCreateTag().putDouble("mag", 5); } - if (itemstackiterator.getItem() == ItemRegistry.RPG.get()) { + if (itemstackiterator.getItem() == TargetModItems.RPG.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.77); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 5); @@ -161,7 +161,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 5.75); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == ItemRegistry.M_4.get()) { + if (itemstackiterator.getItem() == TargetModItems.M_4.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.15); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -174,7 +174,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == ItemRegistry.AA_12.get()) { + if (itemstackiterator.getItem() == TargetModItems.AA_12.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -187,7 +187,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 16); itemstackiterator.getOrCreateTag().putDouble("mag", 25); } - if (itemstackiterator.getItem() == ItemRegistry.BOCEK.get()) { + if (itemstackiterator.getItem() == TargetModItems.BOCEK.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 2); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -197,7 +197,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); itemstackiterator.getOrCreateTag().putDouble("damage", 2.4); } - if (itemstackiterator.getItem() == ItemRegistry.HK_416.get()) { + if (itemstackiterator.getItem() == TargetModItems.HK_416.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.3); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -210,7 +210,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == ItemRegistry.RPK.get()) { + if (itemstackiterator.getItem() == TargetModItems.RPK.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.0); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -226,7 +226,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 50); } - if (itemstackiterator.getItem() == ItemRegistry.KRABER.get()) { + if (itemstackiterator.getItem() == TargetModItems.KRABER.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.8); itemstackiterator.getOrCreateTag().putDouble("zoom", 3); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -239,7 +239,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 40); itemstackiterator.getOrCreateTag().putDouble("mag", 4); } - if (itemstackiterator.getItem() == ItemRegistry.VECTOR.get()) { + if (itemstackiterator.getItem() == TargetModItems.VECTOR.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.6); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -252,7 +252,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 22); itemstackiterator.getOrCreateTag().putDouble("mag", 33); } - if (itemstackiterator.getItem() == ItemRegistry.MINIGUN.get()) { + if (itemstackiterator.getItem() == TargetModItems.MINIGUN.get()) { itemstackiterator.getOrCreateTag().putDouble("zoom", 1); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -265,7 +265,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 40); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == ItemRegistry.MK_14.get()) { + if (itemstackiterator.getItem() == TargetModItems.MK_14.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 3.4); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -279,7 +279,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 20); } - if (itemstackiterator.getItem() == ItemRegistry.SENTINEL.get()) { + if (itemstackiterator.getItem() == TargetModItems.SENTINEL.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 3); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -291,7 +291,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("headshot", 3); itemstackiterator.getOrCreateTag().putDouble("velocity", 50); } - if (itemstackiterator.getItem() == ItemRegistry.M_60.get()) { + if (itemstackiterator.getItem() == TargetModItems.M_60.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -307,7 +307,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 100); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == ItemRegistry.SVD.get()) { + if (itemstackiterator.getItem() == TargetModItems.SVD.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 4); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -319,7 +319,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 50); itemstackiterator.getOrCreateTag().putDouble("mag", 10); } - if (itemstackiterator.getItem() == ItemRegistry.MARLIN.get()) { + if (itemstackiterator.getItem() == TargetModItems.MARLIN.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -331,7 +331,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 27); itemstackiterator.getOrCreateTag().putDouble("mag", 8); } - if (itemstackiterator.getItem() == ItemRegistry.M_870.get()) { + if (itemstackiterator.getItem() == TargetModItems.M_870.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 3); diff --git a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java index 6094f3976..b1cf76310 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; @@ -33,7 +33,7 @@ public class GunsTipsProcedure { String firemode = ""; ItemStack usehand = ItemStack.EMPTY; if (itemstack.is(ItemTags.create(new ResourceLocation("target:gun")))) { - if (itemstack.getItem() == ItemRegistry.BOCEK.get()) { + if (itemstack.getItem() == TargetModItems.BOCEK.get()) { tooltip.add(Component.literal(("\u00A7l\u00A77Damage:(" + new java.text.DecimalFormat("##.##").format(2.4 * itemstack.getOrCreateTag().getDouble("damageadd")) + ")*10/" + new java.text.DecimalFormat("##.##").format(24 * itemstack.getOrCreateTag().getDouble("damageadd"))))); } else { @@ -57,19 +57,19 @@ public class GunsTipsProcedure { + new java.text.DecimalFormat("##.##").format(100 * (itemstack.getOrCreateTag().getDouble("damagenow") / itemstack.getOrCreateTag().getDouble("damageneed"))) + "%"))); } } - if (itemstack.getItem() == ItemRegistry.CREATIVE_AMMO_BOX.get()) { + if (itemstack.getItem() == TargetModItems.CREATIVE_AMMO_BOX.get()) { tooltip.add(Component.literal("Creative Ammo * 2147483647")); } - if (itemstack.getItem() == ItemRegistry.RIFLE_AMMO_BOX.get()) { + if (itemstack.getItem() == TargetModItems.RIFLE_AMMO_BOX.get()) { tooltip.add(Component.literal("Rifle Ammo * 30")); } - if (itemstack.getItem() == ItemRegistry.HANDGUN_AMMO_BOX.get()) { + if (itemstack.getItem() == TargetModItems.HANDGUN_AMMO_BOX.get()) { tooltip.add(Component.literal("Handgun Ammo * 30")); } - if (itemstack.getItem() == ItemRegistry.SHOTGUN_AMMO_BOX.get()) { + if (itemstack.getItem() == TargetModItems.SHOTGUN_AMMO_BOX.get()) { tooltip.add(Component.literal("Shotgun Ammo * 12")); } - if (itemstack.getItem() == ItemRegistry.SNIPER_AMMO_BOX.get()) { + if (itemstack.getItem() == TargetModItems.SNIPER_AMMO_BOX.get()) { tooltip.add(Component.literal("Sniper Ammo * 12")); } } diff --git a/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 99ea4e771..fc8dfdaeb 100644 --- a/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.HANDGUN_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.HANDGUN_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 4f8c131cc..aa80df9b5 100644 --- a/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -32,7 +32,7 @@ public class HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.HANDGUN_AMMO.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.HANDGUN_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java index ff46010ea..6e4c56a60 100644 --- a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -35,13 +35,13 @@ public class Hk416firerandomProcedure { entity.getPersistentData().putDouble("hkfire", 0); } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 1) { + if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 1) { Hk416autofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 3) { + if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 3) { Hk416autofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 5) { + if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 5) { Hk416autofireProcedure.execute(entity); } if (entity.getPersistentData().getDouble("hkfire") >= 5) { diff --git a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java index 9931c6181..d2891bbcd 100644 --- a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -35,13 +35,13 @@ public class M4firerandomProcedure { entity.getPersistentData().putDouble("m4fire", 0); } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 1) { + if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 1) { M4autofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 3) { + if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 3) { M4autofireProcedure.execute(entity); } - if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 5) { + if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 5) { M4autofireProcedure.execute(entity); } if (entity.getPersistentData().getDouble("m4fire") >= 5) { diff --git a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java index 95193e50e..a65db0b81 100644 --- a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -35,7 +35,7 @@ public class M60autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.M_60.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.M_60.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (usehand.getOrCreateTag().getDouble("animindex") == 1) { usehand.getOrCreateTag().putDouble("animindex", 0); diff --git a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 1f86498fc..9a55b607c 100644 --- a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -46,7 +46,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= ammo1) { itemstack.getOrCreateTag().putDouble("ammo", (itemstack.getOrCreateTag().getDouble("ammo") + ammo1)); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.GRENADE_40MM.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); @@ -54,7 +54,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { } else { itemstack.getOrCreateTag().putDouble("ammo", (itemstack.getOrCreateTag().getDouble("ammo") + itemstack.getOrCreateTag().getDouble("maxammo"))); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.GRENADE_40MM.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java index afd28b855..e0111b053 100644 --- a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; @@ -12,7 +12,7 @@ public class M79uiXianShiYouXiNeiDieJiaCengProcedure { public static boolean execute(Entity entity) { if (entity == null) return false; - return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON + return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON && !(entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming; } } diff --git a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java index d063aef18..97da1c32e 100644 --- a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -17,7 +17,7 @@ public class MarlinfireProcedure { if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("forcestop", 1); } - if (usehand.getItem() == ItemRegistry.MARLIN.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) + if (usehand.getItem() == TargetModItems.MARLIN.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java index c60fc4c14..bdadd3987 100644 --- a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -34,7 +34,7 @@ public class MinigunautofireProcedure { return; ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.getItem() == ItemRegistry.MINIGUN.get()) { + if (usehand.getItem() == TargetModItems.MINIGUN.get()) { if (entity.getPersistentData().getDouble("minifiring") == 1 && !entity.isSprinting()) { if (usehand.getOrCreateTag().getDouble("rot") < 10) { usehand.getOrCreateTag().putDouble("rot", (usehand.getOrCreateTag().getDouble("rot") + 1)); @@ -51,7 +51,7 @@ public class MinigunautofireProcedure { } } } - if (usehand.getItem() == ItemRegistry.MINIGUN.get() && usehand.getOrCreateTag().getDouble("overheat") == 0 + if (usehand.getItem() == TargetModItems.MINIGUN.get() && usehand.getOrCreateTag().getDouble("overheat") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 && !(entity instanceof Player _plrCldCheck13 && _plrCldCheck13.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("rot") >= 10) { usehand.getOrCreateTag().putDouble("heat", (usehand.getOrCreateTag().getDouble("heat") + 1)); diff --git a/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java b/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java index 73b4c6c33..fc049c8eb 100644 --- a/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -17,7 +17,7 @@ public class MiniguninbackpackProcedure { } else { itemstack.getOrCreateTag().putDouble("heatbar", (itemstack.getOrCreateTag().getDouble("heat"))); } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get())) { entity.getPersistentData().putDouble("minigunfiring", 0); } if (itemstack.getOrCreateTag().getDouble("overheat") > 0) { diff --git a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java index c3b922ca1..82ca2cba5 100644 --- a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Mk14autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.MK_14.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.MK_14.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 2); diff --git a/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java b/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java index 874b3e981..15da784b7 100644 --- a/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; @@ -12,17 +12,17 @@ public class MortarDangXiaoShiShiJianDaoShiProcedure { if (world instanceof Level _level && !_level.isClientSide()) _level.explode(null, x, y, z, 0, Level.ExplosionInteraction.NONE); if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BARREL.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BARREL.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BIPOD.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BIPOD.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BASE_PLATE.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BASE_PLATE.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } diff --git a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java index 0c4295e87..4e019e333 100644 --- a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -39,8 +39,8 @@ public class PressFireProcedure { M870fireProcedure.execute(entity); AKfireProcedure.execute(entity); if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get()) + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get()) && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") != 1) { { @@ -51,7 +51,7 @@ public class PressFireProcedure { } } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get() && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo == 0) { { Entity _ent = entity; diff --git a/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java index f6dc80469..9d3e6e813 100644 --- a/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class PullXiaoGuoChiXuShiMeiKeFaShengProcedure { if (entity == null) return; if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowpullhold) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") < 12) { @@ -71,7 +71,7 @@ public class PullXiaoGuoChiXuShiMeiKeFaShengProcedure { } } } else { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("power", 0); } { diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java index 1c8bec40c..374302d10 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java @@ -12,7 +12,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSource; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import javax.annotation.Nullable; @@ -272,7 +272,7 @@ public class ReloadsoundstopProcedure { } } } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MARLIN.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MARLIN.get())) { { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { @@ -295,7 +295,7 @@ public class ReloadsoundstopProcedure { } } } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_870.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_870.get())) { { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { diff --git a/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java b/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java index c6d94fdc5..27ad5eaa1 100644 --- a/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java @@ -25,7 +25,7 @@ public class RengchumortarProcedure { } } if (entity instanceof Player player && !player.isCreative()) { - ItemStack _stktoremove = new ItemStack(TargetModItems.MORTAR_DEPOLYER.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.MORTAR_DEPLOYER.get()); player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); player.swing(InteractionHand.MAIN_HAND, true); } diff --git a/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 84fa2824a..5cef27ad1 100644 --- a/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.RIFLE_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.RIFLE_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 91914e0f9..c1b9d0836 100644 --- a/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.RIFLE_AMMO.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.RIFLE_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java b/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java index 63dca068d..8b849abeb 100644 --- a/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -20,7 +20,7 @@ public class RocketShiTiBeiGongJuJiZhongShiProcedure { if (world instanceof Level _level && !_level.isClientSide()) _level.explode(null, (sourceentity.getX()), (sourceentity.getY() + 1), (sourceentity.getZ()), 6, Level.ExplosionInteraction.NONE); if (sourceentity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.ROCKET.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.ROCKET.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java index f4fd25990..b5cffdc67 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -27,11 +27,11 @@ public class RpgemptyProcedure { private static void execute(@Nullable Event event, Entity entity) { if (entity == null) return; - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.RPG.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 1) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("empty", 0); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 1) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("empty", 0); } diff --git a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java index 34b6699d8..a37d1d4c2 100644 --- a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class RpkautofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.RPK.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.RPK.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 2); diff --git a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 851b5881a..4c8b70a68 100644 --- a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.SHOTGUN_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 41bbf35e9..9e1a5c6d4 100644 --- a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.SHOTGUN_AMMO.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.SHOTGUN_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index abdf4c931..7b5c96c60 100644 --- a/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.SNIPER_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.SNIPER_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 2f5938709..5ff4a9daf 100644 --- a/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -32,7 +32,7 @@ public class SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.SNIPER_AMMO.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.SNIPER_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index fd9892b25..123a9a1e5 100644 --- a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -50,7 +50,7 @@ public class TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= 0) { itemstack.getOrCreateTag().putDouble("ammo", 1); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.ROCKET.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.ROCKET.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java index c5a65dacc..4bd34e196 100644 --- a/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.arguments.EntityAnchorArgument; import net.minecraft.world.entity.Entity; @@ -18,7 +18,7 @@ public class Target1DangYouJiShiTiShiProcedure { if (!entity.level().isClientSide()) entity.discard(); if (sourceentity instanceof Player _player) { - ItemStack _setstack = new ItemStack(ItemRegistry.TARGET_DEPLOYER.get()); + ItemStack _setstack = new ItemStack(TargetModItems.TARGET_DEPLOYER.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java index 910a20893..0a8944f1f 100644 --- a/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java @@ -1,7 +1,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -23,7 +23,7 @@ public class TargetdeployerDangYouJianDianJiFangKuaiShiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.TARGET_DEPLOYER.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.TARGET_DEPLOYER.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof LivingEntity _entity) diff --git a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java index a027f3514..2b071b44d 100644 --- a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -45,7 +45,7 @@ public class TasercooldownProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= 1) { itemstack.getOrCreateTag().putDouble("ammo", 1); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(ItemRegistry.TASER_ELECTRODE.get()); + ItemStack _stktoremove = new ItemStack(TargetModItems.TASER_ELECTRODE.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java index ecb57ade7..aded68773 100644 --- a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.resources.ResourceLocation; @@ -43,7 +43,7 @@ public class VecBurstFireProcedure { usehand.getOrCreateTag().putDouble("burst", 0); } } - if (usehand.getItem() == ItemRegistry.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck9 && _plrCldCheck9.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("burst") > 0) { if (usehand.getOrCreateTag().getDouble("burst") == 1) { if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java index f60974efc..25f5e8fcf 100644 --- a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class VecautofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == ItemRegistry.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == TargetModItems.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 1); diff --git a/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java b/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java index 0444b91ce..ae7315d8a 100644 --- a/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.ItemRegistry; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -29,10 +29,10 @@ public class WeaponDrawProcedure { } if (entity instanceof Player _player) _player.getCooldowns().addCooldown(itemstack.getItem(), 16); - if (itemstack.getItem() == ItemRegistry.RPG.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { + if (itemstack.getItem() == TargetModItems.RPG.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { itemstack.getOrCreateTag().putDouble("empty", 1); } - if (itemstack.getItem() == ItemRegistry.SKS.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { + if (itemstack.getItem() == TargetModItems.SKS.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { itemstack.getOrCreateTag().putDouble("gj", 1); } } diff --git a/src/main/resources/assets/target/models/item/moratr_base_plate.json b/src/main/resources/assets/target/models/item/mortar_base_plate.json similarity index 53% rename from src/main/resources/assets/target/models/item/moratr_base_plate.json rename to src/main/resources/assets/target/models/item/mortar_base_plate.json index 3d46ae839..3ce46a73b 100644 --- a/src/main/resources/assets/target/models/item/moratr_base_plate.json +++ b/src/main/resources/assets/target/models/item/mortar_base_plate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "target:item/base_plate" + "layer0": "target:item/mortar_base_plate" } } \ No newline at end of file diff --git a/src/main/resources/assets/target/textures/item/base_plate.png b/src/main/resources/assets/target/textures/item/mortar_base_plate.png similarity index 100% rename from src/main/resources/assets/target/textures/item/base_plate.png rename to src/main/resources/assets/target/textures/item/mortar_base_plate.png