Merge branch 'mc-1.21.3'

1 files changed, 29 insertions, 0 deletions

diff --git a/src/main/kotlin/util/mc/TolerantRegistriesOps.kt b/src/main/kotlin/util/mc/TolerantRegistriesOps.kt
new file mode 100644
index 0000000..ce596a0
--- /dev/null
+++ b/src/main/kotlin/util/mc/TolerantRegistriesOps.kt
@@ -0,0 +1,29 @@
+package moe.nea.firmament.util.mc
+
+import com.mojang.serialization.DynamicOps
+import java.util.Optional
+import net.minecraft.registry.Registry
+import net.minecraft.registry.RegistryKey
+import net.minecraft.registry.RegistryOps
+import net.minecraft.registry.RegistryWrapper
+import net.minecraft.registry.entry.RegistryEntryOwner
+
+class TolerantRegistriesOps<T>(
+	delegate: DynamicOps<T>,
+	registryInfoGetter: RegistryInfoGetter
+) : RegistryOps<T>(delegate, registryInfoGetter) {
+	constructor(delegate: DynamicOps<T>, registry: RegistryWrapper.WrapperLookup) :
+		this(delegate, CachedRegistryInfoGetter(registry))
+
+	class TolerantOwner<E> : RegistryEntryOwner<E> {
+		override fun ownerEquals(other: RegistryEntryOwner<E>?): Boolean {
+			return true
+		}
+	}
+
+	override fun <E : Any?> getOwner(registryRef: RegistryKey<out Registry<out E>>?): Optional<RegistryEntryOwner<E>> {
+		return super.getOwner(registryRef).map {
+			TolerantOwner()
+		}
+	}
+}