DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Reference forge registries directly, when possible

Browse Source
This commit is contained in:
DBotThePony 2023-01-13 18:56:17 +07:00
parent 3c0f74bc03
commit 90dd782bcf
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt
View File

@ -16,6 +16,7 @@ import net.minecraft.world.item.Tiers
import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.Block
import net.minecraftforge.data.event.GatherDataEvent import net.minecraftforge.data.event.GatherDataEvent
import net.minecraftforge.registries.ForgeRegistries import net.minecraftforge.registries.ForgeRegistries
import net.minecraftforge.registries.IForgeRegistry
import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.DataGen
import java.util.stream.Stream import java.util.stream.Stream
@ -60,10 +61,18 @@ interface ForgeTagAppender<T> : MTagAppender<T> {
} }
} }
private fun <T> vanillaLookup(key: ResourceKey<Registry<T>>): (T) -> ResourceLocation? {
val registry by lazy { (BuiltInRegistries.REGISTRY.get(key.location()) ?: throw NoSuchElementException("No such registry $key")) as Registry<T> }
return { registry.getKey(it) }
}
class TagsProvider( class TagsProvider(
private val event: GatherDataEvent private val event: GatherDataEvent
) { ) {
inner class Delegate<T>(registry: ResourceKey<Registry<T>>) : MinecraftTagsProvider<T>(event.generator.packOutput, registry, event.lookupProvider, DataGen.MOD_ID, event.existingFileHelper) { inner class Delegate<T> private constructor(key: ResourceKey<Registry<T>>, val lookup: (T) -> ResourceLocation?) : MinecraftTagsProvider<T>(event.generator.packOutput, key, event.lookupProvider, DataGen.MOD_ID, event.existingFileHelper) {
constructor(registry: IForgeRegistry<T>) : this(registry.registryKey, registry::getKey)
constructor(key: ResourceKey<Registry<T>>) : this(key, vanillaLookup(key))
init { init {
event.generator.addProvider(true, this) event.generator.addProvider(true, this)
} }
@ -75,12 +84,10 @@ class TagsProvider(
return return
} }
val registry = (BuiltInRegistries.REGISTRY.get(registryKey.location()) ?: throw NoSuchElementException("No such registry $registryKey")) as Registry<T>
for ((tag, values) in tags) { for ((tag, values) in tags) {
tag(tag).also { tag(tag).also {
for (value in values) { for (value in values) {
it.add(ResourceKey.create(registryKey, registry.getKey(value) ?: throw NoSuchElementException("$value is missing from $registry"))) it.add(ResourceKey.create(registryKey, lookup(value) ?: throw NoSuchElementException("$value is missing from $registryKey")))
} }
} }
} }
@ -176,9 +183,9 @@ class TagsProvider(
} }
} }
val blocks = Delegate(Registries.BLOCK) val blocks = Delegate(ForgeRegistries.BLOCKS)
val items = Delegate(Registries.ITEM) val items = Delegate(ForgeRegistries.ITEMS)
val mobEffects = Delegate(Registries.MOB_EFFECT) val mobEffects = Delegate(ForgeRegistries.MOB_EFFECTS)
val androidImmuneEffects = mobEffects.appender(MatteryPlayerCapability.ANDROID_IMMUNE_EFFECTS) val androidImmuneEffects = mobEffects.appender(MatteryPlayerCapability.ANDROID_IMMUNE_EFFECTS)