Update to 1.18-pre6

Author: Patbox

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ 1.17 ]
+    branches: [ 1.17, 1.18 ]
 
 jobs:
   build:
@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-  id 'fabric-loom' version '0.8-SNAPSHOT'
+  id 'fabric-loom' version '0.10-SNAPSHOT'
   id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "+" + project.minecraft_version
@@ -24,10 +24,6 @@ dependencies {
   modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
   modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-  modRuntime("supercoder79:databreaker:0.2.7") {
-    exclude module: "fabric-loader"
-  }
 }
 
 processResources {
@@ -40,7 +36,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
   it.options.encoding = "UTF-8"
-  it.options.release = 16
+  it.options.release = 17
 }
 
 java {

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.17
-yarn_mappings=1.17+build.12
-loader_version=0.11.6
+minecraft_version=1.18-pre6
+yarn_mappings=1.18-pre6+build.3
+loader_version=0.12.5
 
 # Mod Properties
-mod_version=0.4.2
+mod_version=0.4.3
 maven_group=xyz.nucleoid
 archives_base_name=fantasy
 
 # Dependencies
-fabric_version=0.35.2+1.17
+fabric_version=0.42.9+1.18

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Mon Aug 10 09:53:15 AEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/java/xyz/nucleoid/fantasy/Fantasy.java

@@ -37,7 +37,7 @@
 public final class Fantasy {
     public static final Logger LOGGER = LogManager.getLogger(Fantasy.class);
     public static final String ID = "fantasy";
-    public static final RegistryKey<DimensionType> DEFAULT_DIM_TYPE = RegistryKey.of(Registry.DIMENSION_TYPE_KEY,  new Identifier(Fantasy.ID, "default"));
+    public static final RegistryKey<DimensionType> DEFAULT_DIM_TYPE = RegistryKey.of(Registry.DIMENSION_TYPE_KEY, new Identifier(Fantasy.ID, "default"));
 
     private static Fantasy instance;
 
@@ -146,7 +146,7 @@ private RuntimeWorld addTemporaryWorld(RuntimeWorldConfig config) {
 
         try {
             LevelStorage.Session session = this.serverAccess.getSession();
-            FileUtils.forceDeleteOnExit(session.getWorldDirectory(worldKey));
+            FileUtils.forceDeleteOnExit(session.getWorldDirectory(worldKey).toFile());
         } catch (IOException ignored) {
         }
 

src/main/java/xyz/nucleoid/fantasy/RuntimeWorldManager.java

@@ -53,7 +53,7 @@ void delete(ServerWorld world) {
             RemoveFromRegistry.remove(dimensionsRegistry, dimensionKey.getValue());
 
             LevelStorage.Session session = this.serverAccess.getSession();
-            File worldDirectory = session.getWorldDirectory(dimensionKey);
+            File worldDirectory = session.getWorldDirectory(dimensionKey).toFile();
             if (worldDirectory.exists()) {
                 try {
                     FileUtils.deleteDirectory(worldDirectory);

src/main/java/xyz/nucleoid/fantasy/util/VoidChunkGenerator.java

@@ -18,9 +18,11 @@
 import net.minecraft.world.biome.BiomeKeys;
 import net.minecraft.world.biome.source.BiomeAccess;
 import net.minecraft.world.biome.source.FixedBiomeSource;
+import net.minecraft.world.biome.source.util.MultiNoiseUtil;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.StructureAccessor;
+import net.minecraft.world.gen.chunk.Blender;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.StructuresConfig;
 import net.minecraft.world.gen.chunk.VerticalBlockSample;
@@ -67,6 +69,18 @@ public ChunkGenerator withSeed(long seed) {
         return this;
     }
 
+    @Override
+    public MultiNoiseUtil.MultiNoiseSampler getMultiNoiseSampler() {
+        return (i, j, k) -> {
+            return MultiNoiseUtil.createNoiseValuePoint(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
+        };
+    }
+
+    @Override
+    public void carve(ChunkRegion chunkRegion, long seed, BiomeAccess biomeAccess, StructureAccessor structureAccessor, Chunk chunk, GenerationStep.Carver generationStep) {
+
+    }
+
     @Override
     public void setStructureStarts(DynamicRegistryManager registryManager, StructureAccessor accessor, Chunk chunk, StructureManager manager, long seed) {
     }
@@ -76,26 +90,33 @@ public void addStructureReferences(StructureWorldAccess world, StructureAccessor
     }
 
     @Override
-    public CompletableFuture<Chunk> populateNoise(Executor executor, StructureAccessor accessor, Chunk chunk) {
+    public CompletableFuture<Chunk> populateNoise(Executor executor, Blender blender, StructureAccessor structureAccessor, Chunk chunk) {
         return CompletableFuture.completedFuture(chunk);
     }
 
     @Override
-    public void buildSurface(ChunkRegion region, Chunk chunk) {
+    public int getSeaLevel() {
+        return 0;
     }
 
     @Override
-    public void carve(long seed, BiomeAccess access, Chunk chunk, GenerationStep.Carver carver) {
+    public int getMinimumY() {
+        return 0;
     }
 
     @Override
-    public void generateFeatures(ChunkRegion region, StructureAccessor accessor) {
+    public void generateFeatures(StructureWorldAccess world, Chunk chunk, StructureAccessor structureAccessor) {
     }
 
     @Override
     public void populateEntities(ChunkRegion region) {
     }
 
+    @Override
+    public int getWorldHeight() {
+        return 0;
+    }
+
     @Override
     public int getHeight(int x, int z, Heightmap.Type heightmap, HeightLimitView world) {
         return 0;
@@ -112,6 +133,11 @@ public BlockPos locateStructure(ServerWorld world, StructureFeature<?> feature,
         return null;
     }
 
+    @Override
+    public void buildSurface(ChunkRegion region, StructureAccessor structures, Chunk chunk) {
+
+    }
+
     @Override
     public boolean isStrongholdStartingChunk(ChunkPos chunkPos) {
         return false;

src/main/resources/fabric.mod.json

@@ -20,7 +20,7 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": "*",
-    "minecraft": "1.17.x",
+    "minecraft": "1.18.x",
     "java": ">=16"
   }
 }