diff --git a/appForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java b/appForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java index 8cd07471..04febcdb 100644 --- a/appForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java +++ b/appForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java @@ -10,11 +10,11 @@ @SuppressWarnings("WeakerAccess") public class ItemGroups { - private static final DeferredRegister CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, "legendarium"); - public static final RegistryObject TAB_ARTIFACTS = CREATIVE_TABS.register("artifacts", () -> CreativeModeTab.builder().title(Component.translatable("itemGroup.legendarium.artifacts")).icon(() -> new ItemStack(Items.WEAPON_FARAMIR.get())).displayItems((enabledFlags, populator) -> { - for (var item : Items.CONTENT) { - populator.accept(item); + public static final RegistryObject TAB_ARTIFACTS = REGISTRY.register("artifacts", () -> CreativeModeTab.builder().title(Component.translatable("itemGroup.legendarium.artifacts")).icon(() -> new ItemStack(Items.WEAPON_FARAMIR.get())).displayItems((enabledFlags, populator) -> { + for (var item : Items.REGISTRY.getEntries()) { + populator.accept(item.get()); } }).build()); @@ -22,6 +22,6 @@ private ItemGroups() { } public static void register(IEventBus modEventBus) { - CREATIVE_TABS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForge/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForge/src/main/java/com/github/hummel/legendarium/init/Items.java index dfb58239..89d696d2 100644 --- a/appForge/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForge/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -8,75 +8,70 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import java.util.ArrayList; -import java.util.Collection; - @SuppressWarnings("WeakerAccess") public class Items { - public static final Collection CONTENT = new ArrayList<>(); - - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java b/appForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java index 8bd86c62..a138bafa 100644 --- a/appForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java +++ b/appForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java @@ -1,12 +1,10 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tiers; public class ItemColdWeapon extends SwordItem { public ItemColdWeapon() { super(Tiers.DIAMOND, 3, -2.4f, new Properties()); - Items.CONTENT.add(this); } } \ No newline at end of file diff --git a/appForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java b/appForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java index 1aab1a17..9abeeb58 100644 --- a/appForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java +++ b/appForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java @@ -1,11 +1,9 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.Item; public class ItemGem extends Item { public ItemGem() { super(new Properties().stacksTo(1)); - Items.CONTENT.add(this); } } \ No newline at end of file diff --git a/appForgeArchive/1.14.4/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.14.4/src/main/java/com/github/hummel/legendarium/init/Items.java index c9cb9a84..75c36ff1 100644 --- a/appForgeArchive/1.14.4/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.14.4/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -10,68 +10,68 @@ @SuppressWarnings("WeakerAccess") public class Items { - private static final DeferredRegister ITEMS = new DeferredRegister<>(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = new DeferredRegister<>(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.15.2/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.15.2/src/main/java/com/github/hummel/legendarium/init/Items.java index 35ba9c68..82583ef2 100644 --- a/appForgeArchive/1.15.2/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.15.2/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -10,68 +10,68 @@ @SuppressWarnings("WeakerAccess") public class Items { - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.16.5/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.16.5/src/main/java/com/github/hummel/legendarium/init/Items.java index 35ba9c68..82583ef2 100644 --- a/appForgeArchive/1.16.5/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.16.5/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -10,68 +10,68 @@ @SuppressWarnings("WeakerAccess") public class Items { - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.17.1/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.17.1/src/main/java/com/github/hummel/legendarium/init/Items.java index fcbcd7c3..2837374e 100644 --- a/appForgeArchive/1.17.1/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.17.1/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -10,68 +10,68 @@ @SuppressWarnings("WeakerAccess") public class Items { - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.18.2/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.18.2/src/main/java/com/github/hummel/legendarium/init/Items.java index 7763844f..89d696d2 100644 --- a/appForgeArchive/1.18.2/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.18.2/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -10,68 +10,68 @@ @SuppressWarnings("WeakerAccess") public class Items { - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/handler/ModEventHandler.java b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/handler/ModEventHandler.java index 7f267df2..0b071889 100644 --- a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/handler/ModEventHandler.java +++ b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/handler/ModEventHandler.java @@ -53,8 +53,8 @@ public void onModifyBakingResult(ModelEvent.ModifyBakingResult event) { @SubscribeEvent public void onCreativeModeTabRegistry(CreativeModeTabEvent.Register event) { event.registerCreativeModeTab(new ResourceLocation("legendarium", "legendarium.artifacts"), builder -> builder.title(Component.translatable("itemGroup.legendarium.artifacts")).icon(() -> new ItemStack(Items.WEAPON_FARAMIR.get())).displayItems((enabledFlags, populator) -> { - for (var item : Items.CONTENT) { - populator.accept(item); + for (var item : Items.REGISTRY.getEntries()) { + populator.accept(item.get()); } })); } diff --git a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/init/Items.java b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/init/Items.java index dfb58239..89d696d2 100644 --- a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -8,75 +8,70 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import java.util.ArrayList; -import java.util.Collection; - @SuppressWarnings("WeakerAccess") public class Items { - public static final Collection CONTENT = new ArrayList<>(); - - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, "legendarium"); - public static final RegistryObject WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final RegistryObject WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final RegistryObject WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final RegistryObject WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final RegistryObject WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final RegistryObject WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final RegistryObject WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final RegistryObject WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final RegistryObject WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final RegistryObject WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final RegistryObject WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final RegistryObject WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final RegistryObject WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final RegistryObject WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final RegistryObject WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final RegistryObject WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final RegistryObject WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final RegistryObject WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final RegistryObject WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final RegistryObject WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final RegistryObject WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final RegistryObject WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final RegistryObject WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final RegistryObject WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final RegistryObject WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final RegistryObject ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final RegistryObject SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final RegistryObject ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final RegistryObject SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java index 8bd86c62..a138bafa 100644 --- a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java +++ b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java @@ -1,12 +1,10 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tiers; public class ItemColdWeapon extends SwordItem { public ItemColdWeapon() { super(Tiers.DIAMOND, 3, -2.4f, new Properties()); - Items.CONTENT.add(this); } } \ No newline at end of file diff --git a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemGem.java b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemGem.java index 1aab1a17..9abeeb58 100644 --- a/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemGem.java +++ b/appForgeArchive/1.19.4/src/main/java/com/github/hummel/legendarium/item/ItemGem.java @@ -1,11 +1,9 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.Item; public class ItemGem extends Item { public ItemGem() { super(new Properties().stacksTo(1)); - Items.CONTENT.add(this); } } \ No newline at end of file diff --git a/appNeoForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java b/appNeoForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java index 377c53ce..beafa032 100644 --- a/appNeoForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java +++ b/appNeoForge/src/main/java/com/github/hummel/legendarium/init/ItemGroups.java @@ -10,11 +10,11 @@ @SuppressWarnings("WeakerAccess") public class ItemGroups { - private static final DeferredRegister CREATIVE_TABS = DeferredRegister.create(BuiltInRegistries.CREATIVE_MODE_TAB, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.CREATIVE_MODE_TAB, "legendarium"); - public static final DeferredHolder TAB_ARTIFACTS = CREATIVE_TABS.register("artifacts", () -> CreativeModeTab.builder().title(Component.translatable("itemGroup.legendarium.artifacts")).icon(() -> new ItemStack(Items.WEAPON_FARAMIR.get())).displayItems((enabledFlags, populator) -> { - for (var item : Items.CONTENT) { - populator.accept(item); + public static final DeferredHolder TAB_ARTIFACTS = REGISTRY.register("artifacts", () -> CreativeModeTab.builder().title(Component.translatable("itemGroup.legendarium.artifacts")).icon(() -> new ItemStack(Items.WEAPON_FARAMIR.get())).displayItems((enabledFlags, populator) -> { + for (var item : Items.REGISTRY.getEntries()) { + populator.accept(item.get()); } }).build()); @@ -22,6 +22,6 @@ private ItemGroups() { } public static void register(IEventBus modEventBus) { - CREATIVE_TABS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appNeoForge/src/main/java/com/github/hummel/legendarium/init/Items.java b/appNeoForge/src/main/java/com/github/hummel/legendarium/init/Items.java index c0d1f8a2..b3b4d89b 100644 --- a/appNeoForge/src/main/java/com/github/hummel/legendarium/init/Items.java +++ b/appNeoForge/src/main/java/com/github/hummel/legendarium/init/Items.java @@ -8,75 +8,70 @@ import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; -import java.util.ArrayList; -import java.util.Collection; - @SuppressWarnings("WeakerAccess") public class Items { - public static final Collection CONTENT = new ArrayList<>(); - - private static final DeferredRegister ITEMS = DeferredRegister.create(BuiltInRegistries.ITEM, "legendarium"); + public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.ITEM, "legendarium"); - public static final DeferredHolder WEAPON_ACHARN = ITEMS.register("weapon_acharn", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_AEGLOS = ITEMS.register("weapon_aeglos", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_ALATAR = ITEMS.register("weapon_alatar", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_ANGRIST = ITEMS.register("weapon_angrist", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_ANGUIREL = ITEMS.register("weapon_anguirel", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_ARANRUTH = ITEMS.register("weapon_aranruth", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_AZOG = ITEMS.register("weapon_azog", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_BALIN = ITEMS.register("weapon_balin", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_BARAZANTHUAL = ITEMS.register("weapon_barazanthual", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_BOLG = ITEMS.register("weapon_bolg", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_BOROMIR = ITEMS.register("weapon_boromir", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_CELEBORN = ITEMS.register("weapon_celeborn", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DAGMOR = ITEMS.register("weapon_dagmor", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DAIN = ITEMS.register("weapon_dain", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DENETHOR = ITEMS.register("weapon_denethor", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DORI = ITEMS.register("weapon_dori", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DRAMBORLEG = ITEMS.register("weapon_dramborleg", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DURIN = ITEMS.register("weapon_durin", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_DWALIN = ITEMS.register("weapon_dwalin", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_EOTHAIN = ITEMS.register("weapon_eothain", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_EOWYN = ITEMS.register("weapon_eowyn", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_FARAMIR = ITEMS.register("weapon_faramir", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GAMLING = ITEMS.register("weapon_gamling", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GIMLI = ITEMS.register("weapon_gimli", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GIRION = ITEMS.register("weapon_girion", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GOBLINKING = ITEMS.register("weapon_goblinking", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GORBAG = ITEMS.register("weapon_gorbag", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GOTHMOG = ITEMS.register("weapon_gothmog", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GRIMA = ITEMS.register("weapon_grima", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GURTHANG = ITEMS.register("weapon_gurthang", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_GUTHWINE = ITEMS.register("weapon_guthwine", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_HADHAFANG = ITEMS.register("weapon_hadhafang", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_HERUGRIM = ITEMS.register("weapon_herugrim", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_KHAMUL = ITEMS.register("weapon_khamul", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_KILI = ITEMS.register("weapon_kili", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_LEGOLAS = ITEMS.register("weapon_legolas", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_MELKOR = ITEMS.register("weapon_melkor", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_MOUTHOFSAURON = ITEMS.register("weapon_mouthofsauron", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_NARCIL = ITEMS.register("weapon_narcil", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_NAZGUL = ITEMS.register("weapon_nazgul", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_ORCRIST = ITEMS.register("weapon_orcrist", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_PALLANDO = ITEMS.register("weapon_pallando", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_RADAGAST = ITEMS.register("weapon_radagast", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_SARUMAN = ITEMS.register("weapon_saruman", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_SHAGRAT = ITEMS.register("weapon_shagrat", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_THORIN = ITEMS.register("weapon_thorin", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_THORONDUN = ITEMS.register("weapon_thorondun", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_THRAIN = ITEMS.register("weapon_thrain", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_THRANDUIL = ITEMS.register("weapon_thranduil", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_THROR = ITEMS.register("weapon_thror", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_URFAEL = ITEMS.register("weapon_urfael", ItemColdWeapon::new); - public static final DeferredHolder WEAPON_WITCHKING = ITEMS.register("weapon_witchking", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ACHARN = REGISTRY.register("weapon_acharn", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_AEGLOS = REGISTRY.register("weapon_aeglos", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ALATAR = REGISTRY.register("weapon_alatar", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ANGRIST = REGISTRY.register("weapon_angrist", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ANGUIREL = REGISTRY.register("weapon_anguirel", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ARANRUTH = REGISTRY.register("weapon_aranruth", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_AZOG = REGISTRY.register("weapon_azog", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_BALIN = REGISTRY.register("weapon_balin", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_BARAZANTHUAL = REGISTRY.register("weapon_barazanthual", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_BOLG = REGISTRY.register("weapon_bolg", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_BOROMIR = REGISTRY.register("weapon_boromir", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_CELEBORN = REGISTRY.register("weapon_celeborn", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DAGMOR = REGISTRY.register("weapon_dagmor", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DAIN = REGISTRY.register("weapon_dain", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DENETHOR = REGISTRY.register("weapon_denethor", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DORI = REGISTRY.register("weapon_dori", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DRAMBORLEG = REGISTRY.register("weapon_dramborleg", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DURIN = REGISTRY.register("weapon_durin", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_DWALIN = REGISTRY.register("weapon_dwalin", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_EOTHAIN = REGISTRY.register("weapon_eothain", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_EOWYN = REGISTRY.register("weapon_eowyn", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_FARAMIR = REGISTRY.register("weapon_faramir", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GAMLING = REGISTRY.register("weapon_gamling", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GIMLI = REGISTRY.register("weapon_gimli", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GIRION = REGISTRY.register("weapon_girion", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GOBLINKING = REGISTRY.register("weapon_goblinking", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GORBAG = REGISTRY.register("weapon_gorbag", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GOTHMOG = REGISTRY.register("weapon_gothmog", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GRIMA = REGISTRY.register("weapon_grima", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GURTHANG = REGISTRY.register("weapon_gurthang", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_GUTHWINE = REGISTRY.register("weapon_guthwine", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_HADHAFANG = REGISTRY.register("weapon_hadhafang", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_HERUGRIM = REGISTRY.register("weapon_herugrim", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_KHAMUL = REGISTRY.register("weapon_khamul", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_KILI = REGISTRY.register("weapon_kili", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_LEGOLAS = REGISTRY.register("weapon_legolas", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_MELKOR = REGISTRY.register("weapon_melkor", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_MOUTHOFSAURON = REGISTRY.register("weapon_mouthofsauron", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_NARCIL = REGISTRY.register("weapon_narcil", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_NAZGUL = REGISTRY.register("weapon_nazgul", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_ORCRIST = REGISTRY.register("weapon_orcrist", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_PALLANDO = REGISTRY.register("weapon_pallando", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_RADAGAST = REGISTRY.register("weapon_radagast", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_SARUMAN = REGISTRY.register("weapon_saruman", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_SHAGRAT = REGISTRY.register("weapon_shagrat", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_THORIN = REGISTRY.register("weapon_thorin", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_THORONDUN = REGISTRY.register("weapon_thorondun", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_THRAIN = REGISTRY.register("weapon_thrain", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_THRANDUIL = REGISTRY.register("weapon_thranduil", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_THROR = REGISTRY.register("weapon_thror", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_URFAEL = REGISTRY.register("weapon_urfael", ItemColdWeapon::new); + public static final DeferredHolder WEAPON_WITCHKING = REGISTRY.register("weapon_witchking", ItemColdWeapon::new); - public static final DeferredHolder ARKENSTONE = ITEMS.register("arkenstone", ItemGem::new); - public static final DeferredHolder SILMARIL = ITEMS.register("silmaril", ItemGem::new); + public static final DeferredHolder ARKENSTONE = REGISTRY.register("arkenstone", ItemGem::new); + public static final DeferredHolder SILMARIL = REGISTRY.register("silmaril", ItemGem::new); private Items() { } public static void register(IEventBus modEventBus) { - ITEMS.register(modEventBus); + REGISTRY.register(modEventBus); } } diff --git a/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java b/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java index 8bd86c62..a138bafa 100644 --- a/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java +++ b/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemColdWeapon.java @@ -1,12 +1,10 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tiers; public class ItemColdWeapon extends SwordItem { public ItemColdWeapon() { super(Tiers.DIAMOND, 3, -2.4f, new Properties()); - Items.CONTENT.add(this); } } \ No newline at end of file diff --git a/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java b/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java index 1aab1a17..9abeeb58 100644 --- a/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java +++ b/appNeoForge/src/main/java/com/github/hummel/legendarium/item/ItemGem.java @@ -1,11 +1,9 @@ package com.github.hummel.legendarium.item; -import com.github.hummel.legendarium.init.Items; import net.minecraft.world.item.Item; public class ItemGem extends Item { public ItemGem() { super(new Properties().stacksTo(1)); - Items.CONTENT.add(this); } } \ No newline at end of file