feat: upgrade to fabric 1.18.1

Author: Samarium150

.github/workflows/Gradle CI.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 16
+          java-version: 17
 
       # Validate Gradle Wrapper
       - name: Gradle Wrapper Validation

gradle.properties

@@ -2,14 +2,14 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G
 org.gradle.warning.mode=all
 # Check these on https://fabricmc.net/develop/
-minecraftVersion=1.17.1
-yarnMappings=1.17.1+build.65
+minecraftVersion=1.18.1
+yarnMappings=1.18.1+build.22
 loaderVersion=0.13.3
 # Fabric API
-fabricVersion=0.46.1+1.17
-loomVersion=0.10-SNAPSHOT
+fabricVersion=0.46.6+1.18
+loomVersion=0.11-SNAPSHOT
 # Mod Properties
-modVersion=1.17.1-1.4.0
+modVersion=1.18.1-1.4.0
 mavenGroup=io.github.samarium150
 archivesBaseName=structures_compass-fabric
 # Kotlin

src/main/kotlin/io/github/samarium150/minecraft/mod/structures_compass/client/gui/StructuresCompassScreen.kt

@@ -172,7 +172,7 @@ class StructuresCompassScreen(private val itemStack: ItemStack) : Screen(
         super.render(matrices, mouseX, mouseY, delta)
     }
 
-    override fun isPauseScreen(): Boolean {
+    override fun shouldPause(): Boolean {
         return false
     }
 

src/main/kotlin/io/github/samarium150/minecraft/mod/structures_compass/command/GetCompass.kt

@@ -47,8 +47,8 @@ object GetCompass {
                         .requires { it.hasPermissionLevel(2) }
                         .apply {
                             Registry.STRUCTURE_FEATURE.forEach {
-                                then(CommandManager.literal(it.name)
-                                    .executes { context -> execute(context, it.name) }
+                                then(CommandManager.literal(it.toString())
+                                    .executes { context -> execute(context, it.toString()) }
                                 )
                             }
                         }

src/main/kotlin/io/github/samarium150/minecraft/mod/structures_compass/network/packet/c2s/RequestSyncPacket.kt

@@ -27,6 +27,7 @@ import net.minecraft.network.PacketByteBuf
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.network.ServerPlayNetworkHandler
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.Identifier
 
 class RequestSyncPacket : PacketByteBuf(Unpooled.buffer()) {
@@ -43,7 +44,7 @@ class RequestSyncPacket : PacketByteBuf(Unpooled.buffer()) {
             responseSender: PacketSender
         ) {
             server.execute {
-                StructuresCompassData.readStructureDimensionMap(player.serverWorld)
+                StructuresCompassData.readStructureDimensionMap(player.world as ServerWorld)
                 ServerPlayNetworking.send(player, SyncPacket.ID, SyncPacket(
                     player.mainHandStack,
                     StructuresCompassData.allowedStructures,

src/main/kotlin/io/github/samarium150/minecraft/mod/structures_compass/util/ItemStackHelper.kt

@@ -20,6 +20,7 @@ import io.github.samarium150.minecraft.mod.structures_compass.config.StructuresC
 import io.github.samarium150.minecraft.mod.structures_compass.item.StructuresCompassItem
 import net.minecraft.item.ItemStack
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
 import net.minecraft.text.TranslatableText
 import net.minecraft.util.Identifier
 import net.minecraft.util.math.BlockPos
@@ -78,7 +79,7 @@ fun ItemStack.search(player: ServerPlayerEntity, structureId: Identifier) {
     val structure = structureId.getStructureFeature()
     val radius = StructuresCompassConfig.configData.common.radius
     if (structure != null) {
-        val world = player.serverWorld
+        val world = player.world as ServerWorld
         setStructure(structureId)
         player.sendMessage(TranslatableText("${prefix}msg_searching"), false)
         val pos = world.locateStructure(structure, player.blockPos, radius, getSkip())

src/main/kotlin/io/github/samarium150/minecraft/mod/structures_compass/util/StructureHelper.kt

@@ -25,6 +25,7 @@ import net.minecraft.util.Identifier
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
 import net.minecraft.util.registry.Registry
+import net.minecraft.world.World
 import net.minecraft.world.gen.feature.StructureFeature
 import kotlin.math.roundToInt
 import kotlin.math.sqrt
@@ -44,14 +45,26 @@ fun StructureFeature<*>.getNamespace(): String? {
 fun StructureFeature<*>.getDimensions(world: ServerWorld): List<Identifier> {
     val dimensions = mutableListOf<Identifier>()
     world.server.worlds.forEach {
-        val generator = it.chunkManager.chunkGenerator
-        if (generator.structuresConfig.getForType(this) != null &&
-            generator.biomeSource.hasStructureFeature(this)
-        ) dimensions.add(it.registryKey.value)
+        if (it.canGenerate(this))
+            dimensions.add(it.registryKey.value)
     }
     return dimensions
 }
 
+fun ServerWorld.canGenerate(structure: StructureFeature<*>): Boolean {
+    val generator = chunkManager.chunkGenerator
+    val config = generator.structuresConfig
+    val registry = this.registryManager.get(Registry.BIOME_KEY)
+    if (config.getForType(structure) != null && structure == StructureFeature.STRONGHOLD)
+        return this.registryKey == World.OVERWORLD
+    val biomes: Set<String> = generator.biomeSource.biomes.mapNotNull(registry::getId).map(Identifier::toString).toSet()
+    for (biome in config.getConfiguredStructureFeature(structure).values()) {
+        if (biomes.contains(biome.value.toString()))
+            return true
+    }
+    return false
+}
+
 fun StructureFeature<*>.getDimensions(): List<Identifier> {
     return StructuresCompassData.structuresDimensionsMap[this] ?: listOf()
 }

src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
     "fabricloader": ">=0.13.3",
     "fabric": "*",
     "fabric-language-kotlin": ">=1.7.1+kotlin.1.6.10",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "minecraft": "1.18.1",
+    "java": ">=17"
   }
 }

src/main/resources/structures_compass.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "io.github.samarium150.minecraft.mod.structures_compass.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "injectors": {
     "defaultRequire": 1
   },