From c289ec30f8425d0db70568929d6eb16ee5e2de5c Mon Sep 17 00:00:00 2001 From: Starexify Date: Sat, 18 Jan 2025 15:04:31 +0100 Subject: [PATCH] 21.4.63-beta added EntityType registers --- gradle.properties | 2 +- .../resources/assets/nmt/lang/en_us.json | 3 +++ .../java/net/nova/nmt/data/LangProvider.java | 4 ++-- .../java/net/nova/nmt/init/NMTEntityType.java | 19 ++++--------------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 56ae18f..6cc16ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ parchment_mappings_version=2025.01.05 minecraft_version=1.21.4 minecraft_version_range=[1.21.4, 1.22) -neo_version=21.4.58-beta +neo_version=21.4.63-beta neo_version_range=[21.4,) loader_version_range=[4,) diff --git a/src/generated/resources/assets/nmt/lang/en_us.json b/src/generated/resources/assets/nmt/lang/en_us.json index 088e7c0..c983abd 100644 --- a/src/generated/resources/assets/nmt/lang/en_us.json +++ b/src/generated/resources/assets/nmt/lang/en_us.json @@ -7,7 +7,9 @@ "container.ender_brewing": "Ender Brewing Stand", "effect.nmt.burn": "Burn", "emi.category.nmt.ender_brewing": "Ender Brewing", + "item.nmt.blazing_wither_soul": "Blazing Wither Soul", "item.nmt.ender_wart": "Ender Wart", + "item.nmt.heart_of_the_hell": "Heart of the Hell", "item.nmt.lingering_obsidian_potion.effect.awfully": "Lingering Awfully Potion", "item.nmt.lingering_obsidian_potion.effect.cecity": "Lingering Potion of Cecity", "item.nmt.lingering_obsidian_potion.effect.dimness": "Lingering Potion of Dimness", @@ -61,6 +63,7 @@ "item.nmt.splash_obsidian_potion.effect.titan": "Splash Potion of the Titan", "item.nmt.splash_obsidian_potion.effect.unluck": "Splash Potion of Unluck", "item.nmt.splash_obsidian_potion.effect.withering": "Splash Potion of Withering", + "item.nmt.tear_of_the_nether": "Tear of the Nether", "nmt.creativetab.main": "No More Things", "nmt.creativetab.potions": "No More Things Potions" } \ No newline at end of file diff --git a/src/main/java/net/nova/nmt/data/LangProvider.java b/src/main/java/net/nova/nmt/data/LangProvider.java index 689b584..bd47feb 100644 --- a/src/main/java/net/nova/nmt/data/LangProvider.java +++ b/src/main/java/net/nova/nmt/data/LangProvider.java @@ -84,9 +84,9 @@ protected void addTranslations() { addObsidianPotion(NMTItems.OBSIDIAN_TIPPED_ARROW, NMTPotions.UNLUCK, "Arrow of Unluck"); addObsidianPotion(NMTItems.OBSIDIAN_TIPPED_ARROW, NMTPotions.WITHERING, "Arrow of Withering"); - /*addItem(NMTItems.TEAR_OF_THE_NETHER, "Tear of the Nether"); + addItem(NMTItems.TEAR_OF_THE_NETHER, "Tear of the Nether"); addItem(NMTItems.BLAZING_WITHER_SOUL, "Blazing Wither Soul"); - addItem(NMTItems.HEART_OF_THE_HELL, "Heart of the Hell");*/ + addItem(NMTItems.HEART_OF_THE_HELL, "Heart of the Hell"); // Creative Tab add(CreativeTab.MAIN_TAB_TITLE, "No More Things"); diff --git a/src/main/java/net/nova/nmt/init/NMTEntityType.java b/src/main/java/net/nova/nmt/init/NMTEntityType.java index d1b5f56..788f386 100644 --- a/src/main/java/net/nova/nmt/init/NMTEntityType.java +++ b/src/main/java/net/nova/nmt/init/NMTEntityType.java @@ -1,23 +1,18 @@ package net.nova.nmt.init; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; +import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; -import net.nova.nmt.NoMoreThings; import net.nova.nmt.entity.projectile.ThrownObsidianPotion; -import java.util.function.Supplier; - import static net.nova.nmt.NoMoreThings.MODID; public class NMTEntityType { - public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(Registries.ENTITY_TYPE, MODID); + public static final DeferredRegister.Entities ENTITY_TYPES = DeferredRegister.createEntities(MODID); - public static final Supplier> OBSIDIAN_POTION = register("obsidian_potion", - EntityType.Builder.of(ThrownObsidianPotion::new, MobCategory.MISC) + public static final DeferredHolder, EntityType> OBSIDIAN_POTION = ENTITY_TYPES.registerEntityType("obsidian_potion", + ThrownObsidianPotion::new, MobCategory.MISC, meteoriteBuilder -> meteoriteBuilder .noLootTable() .sized(0.25F, 0.25F) .clientTrackingRange(4) @@ -31,10 +26,4 @@ public class NMTEntityType { .updateInterval(10) .build("fireball_projectile") );*/ - - public static Supplier> register(String name, EntityType.Builder builder) { - return ENTITY_TYPES.register(ResourceKey.create(Registries.ENTITY_TYPE, NoMoreThings.rl(name)).location().getPath(), - () -> builder.build(ResourceKey.create(Registries.ENTITY_TYPE, NoMoreThings.rl(name))) - ); - } }