From bf42b87f25a62ff574f595d75dffa0c8801eee20 Mon Sep 17 00:00:00 2001 From: The Panda Oliver Date: Sun, 26 Jan 2025 23:29:22 +0100 Subject: [PATCH] Simplify registry handling and optimize imports. Removed redundant freezing/unfreezing of registries in `registerNewRegistries` for improved performance and clarity. Updated `TestMod` to replace `Registries.ENTITY_TYPE` with `Registry.ENTITY_TYPE_REGISTRY` and cleaned up unused imports. --- .../src/main/java/me/pandamods/test/TestMod.java | 6 +----- .../pandalib/forge/platform/RegistrationHelperImpl.java | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/common-testmod/src/main/java/me/pandamods/test/TestMod.java b/common-testmod/src/main/java/me/pandamods/test/TestMod.java index 776301f..776005b 100644 --- a/common-testmod/src/main/java/me/pandamods/test/TestMod.java +++ b/common-testmod/src/main/java/me/pandamods/test/TestMod.java @@ -21,14 +21,10 @@ import me.pandamods.pandalib.registry.RegistryRegister; import me.pandamods.test.config.ClientTestConfig; import me.pandamods.test.config.CommonTestConfig; -import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; @@ -46,7 +42,7 @@ public class TestMod { public static final DeferredObject TEST1 = TEST_REGISTER.register("test1", TestRegistry::new); public static final DeferredObject TEST2 = TEST_REGISTER.register("test2", TestRegistry::new); - public static final DeferredRegister> TEST_ENTITY_REGISTER = DeferredRegister.create(MOD_ID, Registries.ENTITY_TYPE); + public static final DeferredRegister> TEST_ENTITY_REGISTER = DeferredRegister.create(MOD_ID, Registry.ENTITY_TYPE_REGISTRY); public static final DeferredObject> TEST3 = TEST_ENTITY_REGISTER.register("test3", () -> EntityType.Builder.createNothing(MobCategory.MISC).build("test3")); public TestMod() { diff --git a/forge/src/main/java/me/pandamods/pandalib/forge/platform/RegistrationHelperImpl.java b/forge/src/main/java/me/pandamods/pandalib/forge/platform/RegistrationHelperImpl.java index ad2aa90..08a95b6 100644 --- a/forge/src/main/java/me/pandamods/pandalib/forge/platform/RegistrationHelperImpl.java +++ b/forge/src/main/java/me/pandamods/pandalib/forge/platform/RegistrationHelperImpl.java @@ -63,17 +63,11 @@ public void registerEvent(RegisterEvent event) { pendingRegistries.values().forEach(pending -> pending.register(event)); } - @SuppressWarnings({"deprecation", "unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes"}) public void registerNewRegistries() { - if (Registry.REGISTRY instanceof MappedRegistry rootRegistry) - rootRegistry.unfreeze(); - for (Registry registry : pendingRegistryTypes) { ((WritableRegistry) Registry.REGISTRY).register(registry.key(), registry, registry.lifecycle()); } - - if (Registry.REGISTRY instanceof MappedRegistry rootRegistry) - rootRegistry.freeze(); } public void addReloadListenerEvent(AddReloadListenerEvent event) {