From b4ccae925ee5d2b4e50dc103bd7fbf13d2af536a Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 6 May 2024 15:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E5=93=81=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/target/TargetMod.java | 10 +- .../target/init/TargetModGunTabs.java | 55 -------- .../mcreator/target/init/TargetModItems.java | 100 +++++++++------ .../mcreator/target/init/TargetModTabs.java | 121 +++--------------- 4 files changed, 81 insertions(+), 205 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/init/TargetModGunTabs.java diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index cdf078469..0590afe22 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -12,8 +12,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.util.AbstractMap; import java.util.ArrayList; @@ -26,7 +24,6 @@ import java.util.function.Supplier; @Mod("target") public class TargetMod { - public static final Logger LOGGER = LogManager.getLogger(TargetMod.class); public static final String MODID = "target"; public TargetMod() { @@ -35,15 +32,12 @@ public class TargetMod { TargetModSounds.REGISTRY.register(bus); TargetModBlocks.REGISTRY.register(bus); - TargetModItems.ITEMS.register(bus); + TargetModItems.register(bus); TargetModEntities.REGISTRY.register(bus); TargetCustomModEntities.ENTITY_TYPES.register(bus); - - TargetModTabs.REGISTRY.register(bus); - - TargetModGunTabs.REGISTRY.register(bus); + TargetModTabs.TABS.register(bus); TargetModMobEffects.REGISTRY.register(bus); diff --git a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java b/src/main/java/net/mcreator/target/init/TargetModGunTabs.java deleted file mode 100644 index 3a451c9f4..000000000 --- a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.mcreator.target.init; - -import net.mcreator.target.TargetMod; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -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(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()); - - @SubscribeEvent - public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { - - if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); - } - } -} diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java index 956b58ff3..55065540c 100644 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -13,41 +13,67 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraftforge.common.ForgeSpawnEggItem; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; +@SuppressWarnings("unused") public class TargetModItems { - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); /** * guns */ - public static final RegistryObject TASER = ITEMS.register("taser", Taser::new); - public static final RegistryObject ABEKIRI = ITEMS.register("abekiri", Abekiri::new); - public static final RegistryObject TRACHELIUM = ITEMS.register("trachelium", Trachelium::new); - public static final RegistryObject VECTOR = ITEMS.register("vector", Vector::new); - public static final RegistryObject AK_47 = ITEMS.register("ak_47", AK47::new); - public static final RegistryObject SKS = ITEMS.register("sks", Sks::new); - public static final RegistryObject M_4 = ITEMS.register("m_4", M4Item::new); - public static final RegistryObject HK_416 = ITEMS.register("hk_416", Hk416Item::new); - public static final RegistryObject MK_14 = ITEMS.register("mk_14", Mk14Item::new); - public static final RegistryObject MARLIN = ITEMS.register("marlin", MarlinItem::new); - public static final RegistryObject SVD = ITEMS.register("svd", SvdItem::new); - public static final RegistryObject M_98B = ITEMS.register("m_98b", M98bItem::new); - public static final RegistryObject SENTINEL = ITEMS.register("sentinel", SentinelItem::new); - public static final RegistryObject HUNTING_RIFLE = ITEMS.register("hunting_rifle", HuntingRifleItem::new); - public static final RegistryObject KRABER = ITEMS.register("kraber", KraberItem::new); - public static final RegistryObject M_870 = ITEMS.register("m_870", M870Item::new); - public static final RegistryObject AA_12 = ITEMS.register("aa_12", Aa12Item::new); - public static final RegistryObject DEVOTION = ITEMS.register("devotion", DevotionItem::new); - public static final RegistryObject RPK = ITEMS.register("rpk", RpkItem::new); - public static final RegistryObject M_60 = ITEMS.register("m_60", M60Item::new); - public static final RegistryObject MINIGUN = ITEMS.register("minigun", MinigunItem::new); - public static final RegistryObject M_79 = ITEMS.register("m_79", M79Item::new); - public static final RegistryObject RPG = ITEMS.register("rpg", RpgItem::new); - public static final RegistryObject BOCEK = ITEMS.register("bocek", BocekItem::new); + public static final DeferredRegister GUNS = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); + public static final RegistryObject TASER = GUNS.register("taser", Taser::new); + public static final RegistryObject ABEKIRI = GUNS.register("abekiri", Abekiri::new); + public static final RegistryObject TRACHELIUM = GUNS.register("trachelium", Trachelium::new); + public static final RegistryObject VECTOR = GUNS.register("vector", Vector::new); + public static final RegistryObject AK_47 = GUNS.register("ak_47", AK47::new); + public static final RegistryObject SKS = GUNS.register("sks", Sks::new); + public static final RegistryObject M_4 = GUNS.register("m_4", M4Item::new); + public static final RegistryObject HK_416 = GUNS.register("hk_416", Hk416Item::new); + public static final RegistryObject MK_14 = GUNS.register("mk_14", Mk14Item::new); + public static final RegistryObject MARLIN = GUNS.register("marlin", MarlinItem::new); + public static final RegistryObject SVD = GUNS.register("svd", SvdItem::new); + public static final RegistryObject M_98B = GUNS.register("m_98b", M98bItem::new); + public static final RegistryObject SENTINEL = GUNS.register("sentinel", SentinelItem::new); + public static final RegistryObject HUNTING_RIFLE = GUNS.register("hunting_rifle", HuntingRifleItem::new); + public static final RegistryObject KRABER = GUNS.register("kraber", KraberItem::new); + public static final RegistryObject M_870 = GUNS.register("m_870", M870Item::new); + public static final RegistryObject AA_12 = GUNS.register("aa_12", Aa12Item::new); + public static final RegistryObject DEVOTION = GUNS.register("devotion", DevotionItem::new); + public static final RegistryObject RPK = GUNS.register("rpk", RpkItem::new); + public static final RegistryObject M_60 = GUNS.register("m_60", M60Item::new); + public static final RegistryObject MINIGUN = GUNS.register("minigun", MinigunItem::new); + public static final RegistryObject M_79 = GUNS.register("m_79", M79Item::new); + public static final RegistryObject RPG = GUNS.register("rpg", RpgItem::new); + public static final RegistryObject BOCEK = GUNS.register("bocek", BocekItem::new); + + /** + * Ammo + */ + public static final DeferredRegister AMMO = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); + + public static final RegistryObject HANDGUN_AMMO = AMMO.register("handgun_ammo", HandgunAmmoItem::new); + public static final RegistryObject RIFLE_AMMO = AMMO.register("rifle_ammo", RifleAmmoItem::new); + public static final RegistryObject SNIPER_AMMO = AMMO.register("sniper_ammo", SniperAmmoItem::new); + public static final RegistryObject SHOTGUN_AMMO = AMMO.register("shotgun_ammo", ShotgunAmmoItem::new); + public static final RegistryObject HANDGUN_AMMO_BOX = AMMO.register("handgun_ammo_box", HandgunAmmoBoxItem::new); + public static final RegistryObject RIFLE_AMMO_BOX = AMMO.register("rifle_ammo_box", RifleAmmoBoxItem::new); + public static final RegistryObject SNIPER_AMMO_BOX = AMMO.register("sniper_ammo_box", SniperAmmoBoxItem::new); + public static final RegistryObject SHOTGUN_AMMO_BOX = AMMO.register("shotgun_ammo_box", ShotgunAmmoBoxItem::new); + public static final RegistryObject CREATIVE_AMMO_BOX = AMMO.register("creative_ammo_box", CreativeAmmoBoxItem::new); + public static final RegistryObject TASER_ELECTRODE = AMMO.register("taser_electrode", TaserElectrodeItem::new); + public static final RegistryObject GRENADE_40MM = AMMO.register("grenade_40mm", Grenade40mmItem::new); + public static final RegistryObject MORTAR_SHELLS = AMMO.register("mortar_shells", MortarShellsItem::new); + public static final RegistryObject ROCKET = AMMO.register("rocket", RocketItem::new); + + /** + * items + */ + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(TargetModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); public static final RegistryObject TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetdeployerItem::new); @@ -104,6 +130,7 @@ public class TargetModItems { public static final RegistryObject EPIC_MATERIAL_PACK = ITEMS.register("epic_material_pack", EpicMaterialPack::new); public static final RegistryObject LEGENDARY_MATERIAL_PACK = ITEMS.register("legendary_material_pack", LegendaryMaterialPack::new); public static final RegistryObject SPECIAL_MATERIAL_PACK = ITEMS.register("special_material_pack", SpecialMaterialPack::new); + public static final RegistryObject TRACHELIUM_BLUEPRINT = ITEMS.register("trachelium_blueprint", TracheliumBlueprint::new); public static final RegistryObject HUNTING_RIFLE_BLUEPRINT = ITEMS.register("hunting_rifle_blueprint", HuntingRifleBlueprint::new); public static final RegistryObject M_79_BLUEPRINT = ITEMS.register("m_79_blueprint", M79Blueprint::new); @@ -127,26 +154,17 @@ public class TargetModItems { public static final RegistryObject AK_47_BLUEPRINT = ITEMS.register("ak_47_blueprint", AK47Blueprint::new); public static final RegistryObject DEVOTION_BLUEPRINT = ITEMS.register("devotion_blueprint", DevotionBlueprint::new); public static final RegistryObject TASER_BLUEPRINT = ITEMS.register("taser_blueprint", TaserBlueprint::new); + public static final RegistryObject GUN_RECYCLE = block(TargetModBlocks.GUN_RECYCLE); - /** - * Ammo - */ - public static final RegistryObject HANDGUN_AMMO = ITEMS.register("handgun_ammo", HandgunAmmoItem::new); - public static final RegistryObject RIFLE_AMMO = ITEMS.register("rifle_ammo", RifleAmmoItem::new); - public static final RegistryObject SNIPER_AMMO = ITEMS.register("sniper_ammo", SniperAmmoItem::new); - public static final RegistryObject SHOTGUN_AMMO = ITEMS.register("shotgun_ammo", ShotgunAmmoItem::new); - public static final RegistryObject HANDGUN_AMMO_BOX = ITEMS.register("handgun_ammo_box", HandgunAmmoBoxItem::new); - public static final RegistryObject RIFLE_AMMO_BOX = ITEMS.register("rifle_ammo_box", RifleAmmoBoxItem::new); - public static final RegistryObject SNIPER_AMMO_BOX = ITEMS.register("sniper_ammo_box", SniperAmmoBoxItem::new); - public static final RegistryObject SHOTGUN_AMMO_BOX = ITEMS.register("shotgun_ammo_box", ShotgunAmmoBoxItem::new); - public static final RegistryObject CREATIVE_AMMO_BOX = ITEMS.register("creative_ammo_box", CreativeAmmoBoxItem::new); - public static final RegistryObject TASER_ELECTRODE = ITEMS.register("taser_electrode", TaserElectrodeItem::new); - public static final RegistryObject GRENADE_40MM = ITEMS.register("grenade_40mm", Grenade40mmItem::new); - public static final RegistryObject MORTAR_SHELLS = ITEMS.register("mortar_shells", MortarShellsItem::new); - public static final RegistryObject ROCKET = ITEMS.register("rocket", RocketItem::new); private static RegistryObject block(RegistryObject block) { return ITEMS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); } + + public static void register(IEventBus bus) { + ITEMS.register(bus); + GUNS.register(bus); + AMMO.register(bus); + } } diff --git a/src/main/java/net/mcreator/target/init/TargetModTabs.java b/src/main/java/net/mcreator/target/init/TargetModTabs.java index 2e62bdfc2..e6dee690e 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModTabs.java @@ -1,7 +1,3 @@ - -/* - * MCreator note: This file will be REGENERATED on each build. - */ package net.mcreator.target.init; import net.mcreator.target.TargetMod; @@ -18,110 +14,33 @@ import net.minecraftforge.registries.RegistryObject; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) 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(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(TargetModItems.CLAYMORE_MINE.get()); - tabData.accept(TargetModBlocks.JUMPPAD_BLOCK.get().asItem()); - 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(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()); - }) + public static final DeferredRegister TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TargetMod.MODID); + public static final RegistryObject GUN_TAB = TABS.register("target_guns", + () -> CreativeModeTab.builder() + .title(Component.translatable("item_group.target.target_guns")) + .icon(() -> new ItemStack(TargetModItems.TASER.get())) + .displayItems((param, output) -> TargetModItems.GUNS.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) .build()); - public static final RegistryObject AMMO = REGISTRY.register("ammo", - () -> 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()); - }) + public static final RegistryObject AMMO_TAB = TABS.register("ammo", + () -> CreativeModeTab.builder() + .title(Component.translatable("item_group.target.ammo")) + .icon(() -> new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get())) + .withTabsBefore(GUN_TAB.getKey()) + .displayItems((param, output) -> TargetModItems.AMMO.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) + .build()); + + public static final RegistryObject ITEM_TAB = TABS.register("target_item", + () -> CreativeModeTab.builder() + .title(Component.translatable("item_group.target.target_item")) + .icon(() -> new ItemStack(TargetModItems.TARGET_DEPLOYER.get())) + .withTabsBefore(AMMO_TAB.getKey()) + .displayItems((param, output) -> TargetModItems.ITEMS.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) .build()); @SubscribeEvent public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { - if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); }