Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

.gitignore

@@ -65,6 +65,8 @@ hs_err_pid*
 .idea/**/dictionaries
 .idea/**/shelf
 
+.idea/
+
 # Generated files
 .idea/**/contentModel.xml
 
@@ -127,17 +129,120 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-# Ignore Gradle build output directory
+### Windows template
-build
+# Windows thumbnail cache files
-/target/
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
 
-.idea/sonarlint/**
+# Dump file
-.idea/codeStyles/**
+*.stackdump
-.idea/**.xml
+
-.idea/modules/**.iml
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Application
+# Archive love files
+*.log.gz
+
+# binary files
+*.bin
+
+# Database files
+*.db
+
+# Cache files
+*.meta
+*.data
+
+### JEnv template
+# JEnv local Java version configuration file
+.java-version
+
+# Used by previous versions of JEnv
+.jenv-version
+
+### VisualStudioCode template
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+### NetBeans template
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+###
+**/target/
 
-!lib/*.jar
 /run/
-idea/**
 
-testDir/
+**/testDir/

buildSrc/build.gradle.kts

@@ -9,6 +9,6 @@ repositories {
 }
 
 dependencies {
-    "implementation"("com.github.jengelman.gradle.plugins:shadow:+")
+    "implementation"("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
     "implementation"("org.yaml:snakeyaml:1.27")
 }

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -21,8 +21,8 @@ fun Project.configureCompilation() {
     apply(plugin = "idea")
     
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_16
+        targetCompatibility = JavaVersion.VERSION_17
     }
     
     tasks.withType<JavaCompile> {

platforms/fabric/build.gradle.kts

@@ -4,7 +4,7 @@ import com.modrinth.minotaur.TaskModrinthUpload
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id("fabric-loom").version("0.10.55")
+    id("fabric-loom").version("0.10.58")
     id("com.modrinth.minotaur").version("1.1.0")
 }
 
@@ -16,7 +16,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.yaml", "com.dfsek.terra.lib.yaml")
 }
 
-val minecraft = "1.18-pre1"
+val minecraft = "1.18-pre5"
 val yarn = "4"
 val fabricLoader = "0.12.5"
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java

@@ -31,7 +31,6 @@ import com.dfsek.terra.util.FastRandom;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.BlockState;
-import net.minecraft.class_6748;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureManager;
@@ -52,6 +51,7 @@ import net.minecraft.world.biome.source.util.MultiNoiseUtil.NoiseValuePoint;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.GenerationStep.Carver;
 import net.minecraft.world.gen.StructureAccessor;
+import net.minecraft.world.gen.chunk.Blender;
 import net.minecraft.world.gen.chunk.StructuresConfig;
 import net.minecraft.world.gen.chunk.VerticalBlockSample;
 import net.minecraft.world.gen.feature.*;
@@ -173,7 +173,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
         if(!accessor.hasStructureReferences(pos)) {
             return super.getEntitySpawnList(biome, accessor, group, pos);
         } else {
-            if(accessor.method_38854(pos, StructureFeature.SWAMP_HUT).hasChildren()) {
+            if(accessor.getStructureAt(pos, StructureFeature.SWAMP_HUT).hasChildren()) {
                 if(group == SpawnGroup.MONSTER) {
                     return SwampHutFeature.MONSTER_SPAWNS;
                 }
@@ -192,7 +192,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
                     return OceanMonumentFeature.MONSTER_SPAWNS;
                 }
                 
-                if(accessor.method_38854(pos, StructureFeature.FORTRESS).hasChildren()) {
+                if(accessor.getStructureAt(pos, StructureFeature.FORTRESS).hasChildren()) {
                     return NetherFortressFeature.MONSTER_SPAWNS;
                 }
             }
@@ -214,7 +214,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
     }
     
     @Override
-    public CompletableFuture<Chunk> populateNoise(Executor executor, class_6748 arg, StructureAccessor structureAccessor, Chunk chunk) {
+    public CompletableFuture<Chunk> populateNoise(Executor executor, Blender arg, StructureAccessor structureAccessor, Chunk chunk) {
         return CompletableFuture.supplyAsync(() -> {
             World world = (World) ((StructureAccessorAccessor) structureAccessor).getWorld();
             delegate.generateChunkData(world, new FastRandom(), chunk.getPos().x, chunk.getPos().z, (ChunkData) chunk);