move to holderLookup & fix compile errors

PssbleTrngle · Dec 15, 2023 · e7b7b1b · e7b7b1b
1 parent b8aef3c
commit e7b7b1b
Show file tree

Hide file tree

Showing 60 changed files with 362 additions and 430 deletions.
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Build and upload
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build sonar
+          arguments: build test sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,4 +22,4 @@ jobs:
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: build test
diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/SkygridTags.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/SkygridTags.kt
@@ -1,19 +1,17 @@
 package com.possible_triangle.skygrid.api
 
 import com.possible_triangle.skygrid.api.SkygridConstants.MOD_ID
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
-import net.minecraft.world.level.block.Block
 
 object SkygridTags {
 
-    val AMETHYST_CLUSTERS = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "amethyst_clusters"))
-    val LOOT_CONTAINERS = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "loot_containers"))
-    val BARRELS = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "barrels"))
-    val CHESTS = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "chests"))
-    val GLASS_SILICA = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "silica_glass"))
-    val FOREIGN_ORES = TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation(MOD_ID, "foreign_ores"))
+    val AMETHYST_CLUSTERS = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "amethyst_clusters"))
+    val LOOT_CONTAINERS = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "loot_containers"))
+    val BARRELS = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "barrels"))
+    val CHESTS = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "chests"))
+    val GLASS_SILICA = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "silica_glass"))
+    val FOREIGN_ORES = TagKey.create(Registries.BLOCK, ResourceLocation(MOD_ID, "foreign_ores"))
 
 }
diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/Validating.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/Validating.kt
@@ -3,13 +3,13 @@ package com.possible_triangle.skygrid.api.xml
 import com.possible_triangle.skygrid.api.SkygridConstants
 import com.possible_triangle.skygrid.api.xml.elements.FilterOperator
 import com.possible_triangle.skygrid.platform.Services
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.world.level.block.Block
 
 interface Validating {
 
     fun validate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         additionalFilters: List<FilterOperator> = emptyList(),
     ): Boolean

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/BlockProvider.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/BlockProvider.kt
@@ -9,7 +9,7 @@ import com.possible_triangle.skygrid.api.xml.Validating
 import com.possible_triangle.skygrid.api.xml.warnInvalid
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
@@ -41,7 +41,7 @@ abstract class BlockProvider : WeightedEntry(), Generator<IBlockAccess>, Validat
             override fun flat(): List<Pair<Block, Double>> = parent.flat()
 
             override fun internalValidate(
-                blocks: Registry<Block>,
+                blocks: HolderLookup.RegistryLookup<Block>,
                 references: IReferenceContext,
                 filters: List<FilterOperator>,
             ): Boolean = parent.internalValidate(blocks, references, filters)
@@ -59,13 +59,13 @@ abstract class BlockProvider : WeightedEntry(), Generator<IBlockAccess>, Validat
     abstract fun flat(): List<Pair<Block, Double>>
 
     protected abstract fun internalValidate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         filters: List<FilterOperator>,
     ): Boolean
 
     final override fun validate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         additionalFilters: List<FilterOperator>,
     ): Boolean {

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/Extra.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/Extra.kt
@@ -10,7 +10,7 @@ import com.possible_triangle.skygrid.api.xml.warnInvalid
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import net.minecraft.core.BlockPos
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
@@ -25,12 +25,12 @@ abstract class Extra : Generator<IBlockAccess>, Validating {
     @Transient
     lateinit var validProviders: WeightedList<BlockProvider>
 
-    abstract fun internalValidate(blocks: Registry<Block>): Boolean
+    abstract fun internalValidate(blocks: HolderLookup.RegistryLookup<Block>): Boolean
 
     abstract fun offset(pos: BlockPos, random: RandomSource): BlockPos
 
     override fun validate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         additionalFilters: List<FilterOperator>,
     ): Boolean {

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/Filter.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/Filter.kt
@@ -1,12 +1,12 @@
 package com.possible_triangle.skygrid.api.xml.elements
 
 import kotlinx.serialization.Serializable
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.world.level.block.Block
 
 @Serializable
 abstract class Filter {
 
-    abstract fun test(block: Block, blocks: Registry<Block>): Boolean
+    abstract fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean
 
 }
diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/FilterOperator.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/FilterOperator.kt
@@ -1,12 +1,12 @@
 package com.possible_triangle.skygrid.api.xml.elements
 
 import kotlinx.serialization.Serializable
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.world.level.block.Block
 
 @Serializable
 abstract class FilterOperator {
 
-    abstract fun test(block: Block, blocks: Registry<Block>): Boolean
+    abstract fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean
 
 }
diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/GridConfig.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/GridConfig.kt
@@ -11,10 +11,10 @@ import com.possible_triangle.skygrid.platform.Services
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
-import net.minecraft.core.RegistryAccess
-import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.core.HolderLookup
+import net.minecraft.core.registries.Registries
 import net.minecraft.nbt.CompoundTag
+import net.minecraft.resources.ResourceKey
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.EntityBlock
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -81,12 +81,12 @@ data class GridConfig(
         else Services.CONFIGS.server.modifierStrategy.filterAndMerge(modifiers)
     }
 
-    fun validate(registries: RegistryAccess, references: IReferenceContext): Boolean {
-        val blockRegistry = registries.registryOrThrow(BuiltInRegistries.BLOCK.key())
-        val entityRegistry = registries.registryOrThrow(BuiltInRegistries.ENTITY_TYPE.key())
+    fun validate(registries: HolderLookup.Provider, references: IReferenceContext): Boolean {
+        val blockRegistry = registries.lookupOrThrow(Registries.BLOCK)
+        val entityRegistry = registries.lookupOrThrow(Registries.ENTITY_TYPE)
 
         loot.validate { true }
-        mobs.validate { entityRegistry.containsKey(it.key) }
+        mobs.validate { entityRegistry.get(ResourceKey.create(Registries.ENTITY_TYPE, it.key)).isPresent }
         gap = Optional.ofNullable(unsafeGap).filter { it.validate(blockRegistry, references) }
 
         modifier = buildModifier()

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Cardinal.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Cardinal.kt
@@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.Direction.*
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Rotation
@@ -32,7 +32,7 @@ data class Cardinal(
         return DIRECTIONS.random(random)
     }
 
-    override fun internalValidate(blocks: Registry<Block>): Boolean {
+    override fun internalValidate(blocks: HolderLookup.RegistryLookup<Block>): Boolean {
         return offset > 0
     }
 

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Offset.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Offset.kt
@@ -3,10 +3,10 @@ package com.possible_triangle.skygrid.api.xml.elements.extras
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.minecraft.core.BlockPos
-import net.minecraft.core.Registry
 import net.minecraft.world.level.block.Block
 import com.possible_triangle.skygrid.api.xml.elements.BlockProvider
 import com.possible_triangle.skygrid.api.xml.elements.Extra
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 
 @Serializable
@@ -20,7 +20,7 @@ data class Offset(
     override val shared: Boolean = false,
 ) : Extra() {
 
-    override fun internalValidate(blocks: Registry<Block>): Boolean {
+    override fun internalValidate(blocks: HolderLookup.RegistryLookup<Block>): Boolean {
         return true
     }
 

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Side.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/extras/Side.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 
@@ -20,7 +20,7 @@ data class Side(
     override val shared: Boolean = false,
 ) : Extra() {
 
-    override fun internalValidate(blocks: Registry<Block>): Boolean {
+    override fun internalValidate(blocks: HolderLookup.RegistryLookup<Block>): Boolean {
         return Direction.byName(on) != null && offset > 0
     }
 

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/filters/ExceptFilter.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/filters/ExceptFilter.kt
@@ -4,14 +4,14 @@ import com.possible_triangle.skygrid.api.xml.elements.Filter
 import com.possible_triangle.skygrid.api.xml.elements.FilterOperator
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.world.level.block.Block
 
 @Serializable
 @SerialName("except")
 data class ExceptFilter(val filters: List<Filter>) : FilterOperator() {
 
-    override fun test(block: Block, blocks: Registry<Block>): Boolean {
+    override fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean {
         return filters.none { it.test(block, blocks) }
     }
 

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/filters/Filters.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/filters/Filters.kt
@@ -5,8 +5,8 @@ import com.possible_triangle.skygrid.api.xml.elements.Filter
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.core.HolderLookup
+import net.minecraft.core.registries.Registries
 import net.minecraft.tags.TagKey
 import net.minecraft.world.level.block.Block
 
@@ -17,8 +17,8 @@ data class NameFilter(val pattern: String) : Filter() {
     @Transient
     private val regex = pattern.toRegex()
 
-    override fun test(block: Block, blocks: Registry<Block>): Boolean {
-        val key = blocks.getKey(block) ?: return false
+    override fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean {
+        val key = block.builtInRegistryHolder().key().location()
         return regex.containsMatchIn(key.toString())
     }
 
@@ -28,8 +28,8 @@ data class NameFilter(val pattern: String) : Filter() {
 @SerialName("mod")
 data class ModFilter(val id: String) : Filter() {
 
-    override fun test(block: Block, blocks: Registry<Block>): Boolean {
-        val key = blocks.getKey(block) ?: return false
+    override fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean {
+        val key = block.builtInRegistryHolder().key().location()
         return key.namespace == id
     }
 
@@ -43,10 +43,12 @@ data class TagFilter(val id: String, val mod: String = "minecraft") : Filter() {
     private val location = keyFrom(id, mod)
 
     @Transient
-    private val key = TagKey.create(BuiltInRegistries.BLOCK.key(), location)
+    private val key = TagKey.create(Registries.BLOCK, location)
 
-    override fun test(block: Block, blocks: Registry<Block>): Boolean {
-        return blocks.getTagOrEmpty(key).map { it.value() }.contains(block)
+    override fun test(block: Block, blocks: HolderLookup.RegistryLookup<Block>): Boolean {
+        return blocks.get(key)
+            .map { list -> list.map { it.value() } }
+            .filter { it.contains(block) }.isPresent
     }
 
 }
diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/BlockList.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/BlockList.kt
@@ -7,7 +7,7 @@ import com.possible_triangle.skygrid.api.xml.elements.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 
@@ -28,7 +28,7 @@ data class BlockList(
     override fun flat(): List<Pair<Block, Double>> = validChildren.flat()
 
     override fun internalValidate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         filters: List<FilterOperator>,
     ): Boolean {

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/Fallback.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/Fallback.kt
@@ -5,7 +5,7 @@ import com.possible_triangle.skygrid.api.xml.elements.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 
@@ -26,7 +26,7 @@ data class Fallback(
     override fun flat(): List<Pair<Block, Double>> = this.provider.flat()
 
     override fun internalValidate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         filters: List<FilterOperator>,
     ): Boolean {

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/Reference.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/Reference.kt
@@ -5,7 +5,7 @@ import com.possible_triangle.skygrid.api.xml.elements.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 
@@ -29,7 +29,7 @@ class Reference(
     override fun flat(): List<Pair<Block, Double>> = this.provider.flat()
 
     override fun internalValidate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         filters: List<FilterOperator>
     ): Boolean {

diff --git a/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/SingleBlock.kt b/api/src/main/kotlin/com/possible_triangle/skygrid/api/xml/elements/providers/SingleBlock.kt
@@ -9,7 +9,9 @@ import com.possible_triangle.skygrid.api.xml.elements.Transformer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.minecraft.core.Registry
+import net.minecraft.core.HolderLookup
+import net.minecraft.core.registries.Registries
+import net.minecraft.resources.ResourceKey
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.block.Block
 
@@ -42,12 +44,12 @@ data class SingleBlock(
     }
 
     override fun internalValidate(
-        blocks: Registry<Block>,
+        blocks: HolderLookup.RegistryLookup<Block>,
         references: IReferenceContext,
         filters: List<FilterOperator>,
     ): Boolean {
-        return blocks.getOptional(key).map {
-            block = it
+        return blocks.get(ResourceKey.create(Registries.BLOCK, key)).map {
+            block = it.value()
         }.isPresent
     }
 }