diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index fbe34b0fd..bac036760 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -214,7 +214,17 @@ public class ModItems { * 单独注册,用于Tab图标,不要删 */ public static final RegistryObject AP_BULLET = PERKS.register("ap_bullet", () -> new PerkItem(ModPerks.AP_BULLET)); - + public static final RegistryObject SILVER_BULLET = PERKS.register("silver_bullet", () -> new PerkItem(ModPerks.SILVER_BULLET)); +// public static final RegistryObject POISONOUS_BULLET = PERKS.register("poisonous_bullet", () -> new PerkItem(ModPerks.POISONOUS_BULLET)); +// public static final RegistryObject BEAST_BULLET = PERKS.register("beast_bullet", () -> new PerkItem(ModPerks.BEAST_BULLET)); +// public static final RegistryObject HEAL_CLIP = PERKS.register("heal_clip", () -> new PerkItem(ModPerks.HEAL_CLIP)); +// public static final RegistryObject FOURTH_TIMES_CHARM = PERKS.register("fourth_times_charm", () -> new PerkItem(ModPerks.FOURTH_TIMES_CHARM)); +// public static final RegistryObject SUBSISTENCE = PERKS.register("subsistence", () -> new PerkItem(ModPerks.SUBSISTENCE)); +// public static final RegistryObject FIELD_DOCTOR = PERKS.register("field_doctor", () -> new PerkItem(ModPerks.FIELD_DOCTOR)); +// public static final RegistryObject KILL_CLIP = PERKS.register("kill_clip", () -> new PerkItem(ModPerks.KILL_CLIP)); +// public static final RegistryObject GUTSHOT_STRAIGHT = PERKS.register("gutshot_straight", () -> new PerkItem(ModPerks.GUTSHOT_STRAIGHT)); +// public static final RegistryObject KILLING_TALLY = PERKS.register("killing_tally", () -> new PerkItem(ModPerks.KILLING_TALLY)); +// public static final RegistryObject HEAD_SEEKER = PERKS.register("head_seeker", () -> new PerkItem(ModPerks.HEAD_SEEKER)); public static void register(IEventBus bus) { ITEMS.register(bus); GUNS.register(bus); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java index 6b6ee31a4..0a35c8f4e 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java @@ -169,35 +169,35 @@ public class ModVillagers { // trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), -// new ItemStack(new PerkItem(ModPerks.POISONOUS_BULLET),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.POISONOUS_BULLET.get(),1), 16, 1, 0.05f)); // // trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), -// new ItemStack(new PerkItem(ModPerks.SUBSISTENCE),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.SUBSISTENCE.get(),1), 16, 1, 0.05f)); // // trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), -// new ItemStack(new PerkItem(ModPerks.KILL_CLIP),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.KILL_CLIP.get(),1), 16, 1, 0.05f)); // // trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), -// new ItemStack(new PerkItem(ModPerks.GUTSHOT_STRAIGHT),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.GUTSHOT_STRAIGHT.get(),1), 16, 1, 0.05f)); // // trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), -// new ItemStack(new PerkItem(ModPerks.HEAD_SEEKER),1), 16, 1, 0.05f)); -// +// new ItemStack(ModItems.HEAD_SEEKER.get(),1), 16, 1, 0.05f)); + + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), + new ItemStack(ModItems.SILVER_BULLET.get(),1), 16, 1, 0.05f)); + +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), +// new ItemStack(ModItems.FIELD_DOCTOR.get(),1), 16, 1, 0.05f)); // // trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), -// new ItemStack(new PerkItem(ModPerks.SILVER_BULLET),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.HEAL_CLIP.get(),1), 16, 1, 0.05f)); // // trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), -// new ItemStack(new PerkItem(ModPerks.FIELD_DOCTOR),1), 16, 1, 0.05f)); -// -// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), -// new ItemStack(new PerkItem(ModPerks.HEAL_CLIP),1), 16, 1, 0.05f)); -// -// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), -// new ItemStack(new PerkItem(ModPerks.KILLING_TALLY),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.KILLING_TALLY.get(),1), 16, 1, 0.05f)); // // trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), -// new ItemStack(new PerkItem(ModPerks.FOURTH_TIMES_CHARM),1), 16, 1, 0.05f)); +// new ItemStack(ModItems.FOURTH_TIMES_CHARM.get(),1), 16, 1, 0.05f)); trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64),