diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 663006757..f391664e6 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -21,7 +21,6 @@ import net.minecraftforge.registries.RegistryObject; public class ModItems { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID); - public static final RegistryObject EXAMPLE_PERK = REGISTRY.register("example_perk", ExamplePerk::new); /** * guns @@ -196,9 +195,15 @@ public class ModItems { public static final DeferredRegister PERKS = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID); public static void registerPerkItems() { - ModPerks.PERKS.getEntries().forEach(registryObject -> PERKS.register(registryObject.getId().getPath(), () -> new PerkItem(registryObject))); + ModPerks.PERKS.getEntries().stream().filter(p -> p != ModPerks.AP_BULLET) + .forEach(registryObject -> PERKS.register(registryObject.getId().getPath(), () -> new PerkItem(registryObject))); } + /** + * 单独注册,用于Tab图标,不要删 + */ + public static final RegistryObject AP_BULLET = PERKS.register("ap_bullet", () -> new PerkItem(ModPerks.AP_BULLET)); + public static void register(IEventBus bus) { ITEMS.register(bus); GUNS.register(bus); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java index 9f05457a9..aaabe7a1d 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java @@ -22,14 +22,14 @@ public class ModPerks { public static final DeferredRegister PERKS = DeferredRegister.create(new ResourceLocation(ModUtils.MODID, "perk"), ModUtils.MODID); - public static final RegistryObject AP_BULLET = PERKS.register("ap_bullet", + public static final RegistryObject AP_BULLET = PERKS.register("ap_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("ap_bullet", Perk.Type.AMMO).bypassArmorRate(0.4f).rgb(230, 0, 0))); - public static final RegistryObject SILVER_BULLET = PERKS.register("silver_bullet", + public static final RegistryObject SILVER_BULLET = PERKS.register("silver_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("silver_bullet", Perk.Type.AMMO).bypassArmorRate(0.05f).rgb(87, 166, 219))); - public static final RegistryObject POISONOUS_BULLET = PERKS.register("poisonous_bullet", + public static final RegistryObject POISONOUS_BULLET = PERKS.register("poisonous_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("poisonous_bullet", Perk.Type.AMMO).bypassArmorRate(0.0f).rgb(48, 131, 6) .mobEffect(() -> MobEffects.POISON))); - public static final RegistryObject BEAST_BULLET = PERKS.register("beast_bullet", + public static final RegistryObject BEAST_BULLET = PERKS.register("beast_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("beast_bullet", Perk.Type.AMMO).bypassArmorRate(0.0f).rgb(134, 65, 14))); public static final RegistryObject HEAL_CLIP = PERKS.register("heal_clip", () -> new Perk("heal_clip", Perk.Type.FUNCTIONAL)); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java index 60af8efca..268da473d 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java @@ -58,7 +58,7 @@ public class ModTabs { public static final RegistryObject PERK_TAB = TABS.register("perk", () -> CreativeModeTab.builder() .title(Component.translatable("item_group.superbwarfare.perk")) - .icon(() -> new ItemStack(ModItems.EXAMPLE_PERK.get())) + .icon(() -> new ItemStack(ModItems.AP_BULLET.get())) .withTabsBefore(GUN_TAB.getKey()) .displayItems((param, output) -> ModItems.PERKS.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) .build()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/ExamplePerk.java b/src/main/java/net/mcreator/superbwarfare/item/ExamplePerk.java deleted file mode 100644 index 57fc618cc..000000000 --- a/src/main/java/net/mcreator/superbwarfare/item/ExamplePerk.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.mcreator.superbwarfare.item; - -import net.minecraft.world.item.Item; -public class ExamplePerk extends Item { - public ExamplePerk() { - super(new Properties()); - } -} diff --git a/src/main/resources/assets/superbwarfare/models/item/example_perk.json b/src/main/resources/assets/superbwarfare/models/item/example_perk.json deleted file mode 100644 index 6acca2cb4..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/example_perk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/perk/killing_tally" - } -} \ No newline at end of file