diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java index 784b28060..f73093a01 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java @@ -17,6 +17,6 @@ public class ModBlocks { public static final RegistryObject DEEPSLATE_GALENA_ORE = REGISTRY.register("deepslate_galena_ore", DeepslateGalenaOreBlock::new); public static final RegistryObject SCHEELITE_ORE = REGISTRY.register("scheelite_ore", ScheeliteOreBlock::new); public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = REGISTRY.register("deepslate_scheelite_ore", DeepslateScheeliteOreBlock::new); - public static final RegistryObject DRAGON_TEETH = REGISTRY.register("dragon_teeth", () -> new DragonTeethBlock()); + public static final RegistryObject DRAGON_TEETH = REGISTRY.register("dragon_teeth", DragonTeethBlock::new); } diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 64126f838..79af83d1e 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -90,7 +90,6 @@ public class ModItems { public static final RegistryObject MONITOR = ITEMS.register("monitor", Monitor::new); public static final RegistryObject TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::new); public static final RegistryObject CLAYMORE_MINE = ITEMS.register("claymore_mine", ClaymoreMine::new); - public static final RegistryObject JUMP_PAD = block(ModBlocks.JUMP_PAD); public static final RegistryObject LIGHT_SABER = ITEMS.register("light_saber", LightSaber::new); public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); @@ -113,16 +112,10 @@ public class ModItems { public static final RegistryObject COAL_POWDER = ITEMS.register("coal_powder", () -> new Item(new Item.Properties())); public static final RegistryObject COAL_IRON_POWDER = ITEMS.register("coal_iron_powder", () -> new Item(new Item.Properties())); public static final RegistryObject RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", () -> new Item(new Item.Properties())); - public static final RegistryObject GALENA_ORE = block(ModBlocks.GALENA_ORE); - public static final RegistryObject DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); - public static final RegistryObject SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE); - public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE); public static final RegistryObject GALENA = ITEMS.register("galena", () -> new Item(new Item.Properties())); public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", () -> new Item(new Item.Properties())); public static final RegistryObject DOG_TAG = ITEMS.register("dog_tag", DogTag::new); public static final RegistryObject SHIELD_CELL = ITEMS.register("shield_cell", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); - public static final RegistryObject DRAGON_TEETH = block(ModBlocks.DRAGON_TEETH); - public static final RegistryObject TUNGSTEN_ROD = ITEMS.register("tungsten_rod", () -> new Item(new Item.Properties())); public static final RegistryObject IRON_BARREL = ITEMS.register("iron_barrel", () -> new Item(new Item.Properties())); @@ -179,12 +172,18 @@ public class ModItems { * Block */ public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID); + + public static final RegistryObject GALENA_ORE = block(ModBlocks.GALENA_ORE); + public static final RegistryObject DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); + public static final RegistryObject SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE); + public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE); + public static final RegistryObject JUMP_PAD = block(ModBlocks.JUMP_PAD); public static final RegistryObject SANDBAG = block(ModBlocks.SANDBAG); public static final RegistryObject BARBED_WIRE = block(ModBlocks.BARBED_WIRE); - + public static final RegistryObject DRAGON_TEETH = block(ModBlocks.DRAGON_TEETH); private static RegistryObject block(RegistryObject block) { - return ITEMS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); + return BLOCKS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); } public static void register(IEventBus bus) { diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java index 9abfa7620..0cf474d1b 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java @@ -20,15 +20,10 @@ public class ModPerks { public static final DeferredRegister PERKS = DeferredRegister.create(new ResourceLocation(ModUtils.MODID, "perk"), ModUtils.MODID); - public static final RegistryObject FOURTH_TIMES_CHARM = PERKS.register("fourth_times_charm", () -> new Perk(Perk.Type.FUNCTIONAL)); public static final RegistryObject GUTSHOT_STRAIGHT = PERKS.register("gutshot_straight", () -> new Perk(Perk.Type.DAMAGE)); public static final RegistryObject HEAL_CLIP = PERKS.register("heal_clip", () -> new Perk(Perk.Type.FUNCTIONAL)); public static final RegistryObject KILL_CLIP = PERKS.register("kill_clip", () -> new Perk(Perk.Type.DAMAGE)); public static final RegistryObject KILLING_TALLY = PERKS.register("killing_tally", () -> new Perk(Perk.Type.DAMAGE)); - public static final RegistryObject LONGER_WIRE = PERKS.register("longer_wire", () -> new Perk(Perk.Type.DAMAGE)); - public static final RegistryObject MONSTER_HUNTER = PERKS.register("monster_hunter", () -> new Perk(Perk.Type.FUNCTIONAL)); - public static final RegistryObject SUPER_RECHARGE = PERKS.register("super_recharge", () -> new Perk(Perk.Type.DAMAGE)); - public static final RegistryObject VOLT_OVERLOAD = PERKS.register("volt_overload", () -> new Perk(Perk.Type.DAMAGE)); - + public static final RegistryObject MONSTER_HUNTER = PERKS.register("monster_hunter", () -> new Perk(Perk.Type.DAMAGE)); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/PerkItem.java b/src/main/java/net/mcreator/superbwarfare/item/PerkItem.java new file mode 100644 index 000000000..6a0555ca0 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/item/PerkItem.java @@ -0,0 +1,10 @@ +package net.mcreator.superbwarfare.item; + +import net.minecraft.world.item.Item; + +public class PerkItem extends Item { + + public PerkItem(Properties pProperties) { + super(pProperties); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/perk/Perk.java b/src/main/java/net/mcreator/superbwarfare/perk/Perk.java index d070308f7..67f6e2aa9 100644 --- a/src/main/java/net/mcreator/superbwarfare/perk/Perk.java +++ b/src/main/java/net/mcreator/superbwarfare/perk/Perk.java @@ -1,6 +1,11 @@ package net.mcreator.superbwarfare.perk; -public record Perk(net.mcreator.superbwarfare.perk.Perk.Type type) { +public class Perk { + public Type type; + + public Perk(Type type) { + this.type = type; + } public enum Type { AMMO(0),