Skip to content

Commit

Permalink
Simplify registry handling and optimize imports.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ThePandaOliver committed Jan 26, 2025
1 parent 13ad9c0 commit bf42b87
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
6 changes: 1 addition & 5 deletions common-testmod/src/main/java/me/pandamods/test/TestMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -46,7 +42,7 @@ public class TestMod {
public static final DeferredObject<TestRegistry> TEST1 = TEST_REGISTER.register("test1", TestRegistry::new);
public static final DeferredObject<TestRegistry> TEST2 = TEST_REGISTER.register("test2", TestRegistry::new);

public static final DeferredRegister<EntityType<?>> TEST_ENTITY_REGISTER = DeferredRegister.create(MOD_ID, Registries.ENTITY_TYPE);
public static final DeferredRegister<EntityType<?>> TEST_ENTITY_REGISTER = DeferredRegister.create(MOD_ID, Registry.ENTITY_TYPE_REGISTRY);
public static final DeferredObject<EntityType<?>> TEST3 = TEST_ENTITY_REGISTER.register("test3", () -> EntityType.Builder.createNothing(MobCategory.MISC).build("test3"));

public TestMod() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit bf42b87

Please sign in to comment.