Update to 26.1.2

Author: Patbox

.github/workflows/build.yml

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

.github/workflows/release.yml

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

build.gradle

@@ -1,20 +1,19 @@
 plugins {
-  id 'fabric-loom' version '1.10.+'
+  id 'net.fabricmc.fabric-loom' version '1.15.+'
   id 'maven-publish'
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
+base {
+  archivesName = project.archives_base_name
+}
 version = project.mod_version + "+" + project.minecraft_version
 group = project.maven_group
 
 dependencies {
   minecraft "com.mojang:minecraft:${project.minecraft_version}"
-  mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-  modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+  implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-  modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+  implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 }
 
 processResources {
@@ -27,27 +26,29 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
   it.options.encoding = "UTF-8"
-  it.options.release = 21
+  it.options.release = 25
 }
 
 java {
   withSourcesJar()
+
+  sourceCompatibility = targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
   from("LICENSE") {
-    rename { "${it}_${project.archivesBaseName}" }
+    rename { "${it}_${project.archives_base_name}" }
   }
 }
 
 publishing {
   publications {
     mavenJava(MavenPublication) {
-      artifact(remapJar) {
-        builtBy remapJar
+      artifact(jar) {
+        builtBy jar
       }
       artifact(sourcesJar) {
-        builtBy remapSourcesJar
+        builtBy sourcesJar
       }
     }
   }

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.13
+minecraft_version=26.1.2
+loader_version=0.18.4
+loom_version=1.15-SNAPSHOT
 
-# Dependencies
-fabric_version=0.119.0+1.21.5
+# Fabric API
+fabric_api_version=0.145.4+26.1.2
 
 # Mod Properties
-mod_version=0.2.3
+mod_version=0.3.0
 maven_group=xyz.nucleoid
 archives_base_name=substrate

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,8 +1,8 @@
 package xyz.nucleoid.substrate.biome;
 
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.world.biome.Biome;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.Biome;
 
 public interface BaseBiomeGen {
-	RegistryKey<Biome> getFakingBiome();
+	ResourceKey<Biome> getFakingBiome();
 }

src/main/java/xyz/nucleoid/substrate/biome/BaseBiomeGen.java

@@ -1,11 +1,11 @@
 package xyz.nucleoid.substrate.biome;
 
 import com.mojang.serialization.MapCodec;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.source.BiomeSource;
-import net.minecraft.world.biome.source.util.MultiNoiseUtil;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.Climate;
 
 public abstract class FakingBiomeSource extends BiomeSource {
 
@@ -18,12 +18,12 @@ public FakingBiomeSource(Registry<Biome> biomeRegistry, long seed) {
     }
 
     @Override
-    protected MapCodec<? extends BiomeSource> getCodec() {
+    protected MapCodec<? extends BiomeSource> codec() {
         return MapCodec.unit(this);
     }
 
     @Override
-    public RegistryEntry<Biome> getBiome(final int x, final int y, final int z, final MultiNoiseUtil.MultiNoiseSampler noise) {
+    public Holder<Biome> getNoiseBiome(final int x, final int y, final int z, final Climate.Sampler noise) {
         return biomeRegistry.getOrThrow(getBiome(x << 2, z << 2).getFakingBiome());
     }
 

src/main/java/xyz/nucleoid/substrate/biome/FakingBiomeSource.java

@@ -5,26 +5,23 @@
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.MapCodec;
-import net.minecraft.registry.Registry;
-import net.minecraft.structure.StructureSet;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ChunkRegion;
-import net.minecraft.world.HeightLimitView;
-import net.minecraft.world.Heightmap;
-import net.minecraft.world.biome.source.BiomeAccess;
-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.VerticalBlockSample;
-import net.minecraft.world.gen.noise.NoiseConfig;
 import xyz.nucleoid.substrate.biome.FakingBiomeSource;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.NoiseColumn;
+import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.RandomState;
+import net.minecraft.world.level.levelgen.blending.Blender;
 
 public class BaseChunkGenerator extends ChunkGenerator {
 	private final FakingBiomeSource biomeSource;
@@ -35,30 +32,30 @@ public BaseChunkGenerator(final FakingBiomeSource biomeSource) {
 	}
 
 	@Override
-	protected MapCodec<? extends ChunkGenerator> getCodec() {
+	protected MapCodec<? extends ChunkGenerator> codec() {
 		return MapCodec.unit(this);
 	}
 
 	@Override
-	public void carve(ChunkRegion chunkRegion, long seed, NoiseConfig noiseConfig, BiomeAccess biomeAccess, StructureAccessor structureAccessor, Chunk chunk) {
+	public void applyCarvers(WorldGenRegion chunkRegion, long seed, RandomState noiseConfig, BiomeManager biomeAccess, StructureManager structureAccessor, ChunkAccess chunk) {
 
 	}
 
 	@Override
-	public void buildSurface(final ChunkRegion region, final StructureAccessor structures, final NoiseConfig noiseConfig, final Chunk chunk) {
+	public void buildSurface(final WorldGenRegion region, final StructureManager structures, final RandomState noiseConfig, final ChunkAccess chunk) {
 	}
 
 	@Override
-	public void populateEntities(final ChunkRegion region) {
+	public void spawnOriginalMobs(final WorldGenRegion region) {
 	}
 
 	@Override
-	public int getWorldHeight() {
+	public int getGenDepth() {
 		return 0;
 	}
 
 	@Override
-	public CompletableFuture<Chunk> populateNoise(Blender blender, NoiseConfig noiseConfig, StructureAccessor structureAccessor, Chunk chunk) {
+	public CompletableFuture<ChunkAccess> fillFromNoise(Blender blender, RandomState noiseConfig, StructureManager structureAccessor, ChunkAccess chunk) {
 		return CompletableFuture.completedFuture(chunk);
 	}
 
@@ -68,22 +65,22 @@ public int getSeaLevel() {
 	}
 
 	@Override
-	public int getMinimumY() {
+	public int getMinY() {
 		return 0;
 	}
 
 	@Override
-	public int getHeight(final int x, final int z, final Heightmap.Type heightmap, final HeightLimitView world, final NoiseConfig noiseConfig) {
+	public int getBaseHeight(final int x, final int z, final Heightmap.Types heightmap, final LevelHeightAccessor world, final RandomState noiseConfig) {
 		return 0;
 	}
 
 	@Override
-	public VerticalBlockSample getColumnSample(final int x, final int z, final HeightLimitView world, final NoiseConfig noiseConfig) {
+	public NoiseColumn getBaseColumn(final int x, final int z, final LevelHeightAccessor world, final RandomState noiseConfig) {
 		return null;
 	}
 
 	@Override
-	public void appendDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
+	public void addDebugScreenInfo(List<String> text, RandomState noiseConfig, BlockPos pos) {
 
 	}
 

src/main/java/xyz/nucleoid/substrate/chunk/BaseChunkGenerator.java

@@ -1,10 +1,10 @@
 package xyz.nucleoid.substrate.gen;
 
-import net.minecraft.block.Blocks;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.util.math.random.Random;
-import net.minecraft.world.ServerWorldAccess;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.block.Blocks;
 
 public final class CactusGen implements MapGen {
     public static final CactusGen INSTANCE = new CactusGen(16, 8, 8);
@@ -19,23 +19,23 @@ public CactusGen(int count, int horizontalSpread, int verticalSpread) {
         this.verticalSpread = verticalSpread;
     }
 
-    public void generate(ServerWorldAccess world, BlockPos pos, Random random) {
+    public void generate(ServerLevelAccessor world, BlockPos pos, RandomSource random) {
         for(int i = 0; i < this.count; ++i) {
             int aX = random.nextInt(this.horizontalSpread) - random.nextInt(this.horizontalSpread);
             int aY = random.nextInt(this.verticalSpread) - random.nextInt(this.verticalSpread);
             int aZ = random.nextInt(this.horizontalSpread) - random.nextInt(this.horizontalSpread);
-            BlockPos local = pos.add(aX, aY, aZ);
+            BlockPos local = pos.offset(aX, aY, aZ);
 
             boolean canGenerate = true;
             for (Direction dir : GenHelper.HORIZONTALS) {
-                if (!world.getBlockState(local.offset(dir)).isAir()) {
+                if (!world.getBlockState(local.relative(dir)).isAir()) {
                     canGenerate = false;
                     break;
                 }
             }
 
-            if (canGenerate && (world.getBlockState(local.down()) == Blocks.SAND.getDefaultState() || world.getBlockState(local.down()) == Blocks.CACTUS.getDefaultState()) && world.getBlockState(local).isAir()) {
-                world.setBlockState(local, Blocks.CACTUS.getDefaultState(), 3);
+            if (canGenerate && (world.getBlockState(local.below()) == Blocks.SAND.defaultBlockState() || world.getBlockState(local.below()) == Blocks.CACTUS.defaultBlockState()) && world.getBlockState(local).isAir()) {
+                world.setBlock(local, Blocks.CACTUS.defaultBlockState(), 3);
             }
         }
     }