Port

PandaMods-Dev · Jan 25, 2025 · e1f70f4 · e1f70f4
1 parent ad9c883
commit e1f70f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 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
@@ -13,7 +13,6 @@
 package me.pandamods.test;
 
 import com.mojang.serialization.Lifecycle;
-import dev.architectury.event.events.client.ClientLifecycleEvent;
 import me.pandamods.pandalib.config.PandaLibConfig;
 import me.pandamods.pandalib.config.holders.ClientConfigHolder;
 import me.pandamods.pandalib.config.holders.CommonConfigHolder;
@@ -22,6 +21,7 @@
 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.resources.ResourceKey;
@@ -35,7 +35,7 @@ public class TestMod {
 	private static final ClientConfigHolder<ClientTestConfig> CLIENT_TEST_CONFIG = PandaLibConfig.registerClient(ClientTestConfig.class);
 
 	public static final ResourceKey<Registry<TestRegistry>> TEST_REGISTRY_KEY = ResourceKey.createRegistryKey(TestMod.resourceLocation("test_registry"));
-	public static final Registry<TestRegistry> TEST_REGISTRY = RegistryRegister.register(new MappedRegistry<>(TEST_REGISTRY_KEY, Lifecycle.stable()));
+	public static final Registry<TestRegistry> TEST_REGISTRY = RegistryRegister.register(new MappedRegistry<>(TEST_REGISTRY_KEY, Lifecycle.stable(), null));
 
 	public static final DeferredRegister<TestRegistry> TEST_REGISTER = DeferredRegister.create(MOD_ID, TEST_REGISTRY);
 	public static final DeferredObject<TestRegistry> TEST1 = TEST_REGISTER.register("test1", TestRegistry::new);

diff --git a/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java b/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java
@@ -14,7 +14,6 @@
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 
@@ -62,7 +61,7 @@ public ResourceKey<? extends Registry<?>> getRegistryKey() {
 	}
 
 	public Registry<?> getRegistry() {
-		return BuiltInRegistries.REGISTRY.get(getKey().registry());
+		return Registry.REGISTRY.get(getKey().registry());
 	}
 
 	public ResourceLocation getId() {

diff --git a/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java b/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java
@@ -19,7 +19,6 @@
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
@@ -43,10 +42,10 @@ public <T> void register(DeferredObject<? extends T> deferredObject, Supplier<?
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public <T> void registerNewRegistry(Registry<T> registry) {
 		ResourceLocation registryName = registry.key().location();
-		if (BuiltInRegistries.REGISTRY.containsKey(registryName))
+		if (Registry.REGISTRY.containsKey(registryName))
 			throw new IllegalStateException("Attempted duplicate registration of registry " + registryName);
 
-		((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
+		((WritableRegistry) Registry.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
 	}
 
 	@Override

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ * Copyright (C) 2025 Oliver Froberg (The Panda Oliver)
  *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -18,7 +18,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
@@ -65,7 +64,7 @@ public void registerEvent(RegisterEvent event) {
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	public void registerNewRegistries() {
 		for (Registry registry : pendingRegistryTypes) {
-			((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
+			((WritableRegistry) Registry.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
 		}
 	}