Save

Author: cheyao

src/main/java/com/cyao/FlatCarverContext.java

@@ -1,22 +1,21 @@
 package com.cyao;
 
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static net.minecraft.registry.Registries.CHUNK_GENERATOR;
-
 public class FlatMinecraft implements ModInitializer {
 	public static final String MOD_ID = "flat-minecraft";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
 	@Override
 	public void onInitialize() {
 		LOGGER.info("Initializing mod");
-		Registry.register(CHUNK_GENERATOR,
-                Identifier.of("flat-minecraft:2D-world"),
+		Registry.register(Registries.CHUNK_GENERATOR,
+                Identifier.of("flat-minecraft:paper-world"),
 				PaperChunkGenerator.CODEC);
 	}
 }

src/main/java/com/cyao/FlatMinecraft.java

@@ -205,7 +205,7 @@ private OptionalInt sampleHeightmap(
                     generationShapeConfig,
                     DensityFunctionTypes.Beardifier.INSTANCE,
                     this.settings.value(),
-                    (AquiferSampler.FluidLevelSampler)this.fluidLevelSampler.get(),
+                    this.fluidLevelSampler.get(),
                     Blender.getNoBlending()
             );
             chunkNoiseSampler.sampleStartDensity();
@@ -296,9 +296,6 @@ public void carve(
                 chunkx -> this.createChunkNoiseSampler(chunkx, structureAccessor, Blender.getBlender(chunkRegion), noiseConfig)
         );
         AquiferSampler aquiferSampler = chunkNoiseSampler.getAquiferSampler();
-        CarverContext carverContext = new CarverContext(
-                this, chunkRegion.getRegistryManager(), chunk.getHeightLimitView(), chunkNoiseSampler, noiseConfig, this.settings.value().surfaceRule()
-        );
         CarvingMask carvingMask = ((ProtoChunk)chunk).getOrCreateCarvingMask(carverStep);
 
         for (int j = -8; j <= 8; j++) {
@@ -318,7 +315,7 @@ public void carve(
                     ConfiguredCarver<?> configuredCarver = registryEntry.value();
                     chunkRandom.setCarverSeed(seed + (long)l, chunkPos2.x, chunkPos2.z);
                     if (configuredCarver.shouldCarve(chunkRandom)) {
-                        configuredCarver.carve(carverContext, chunk, biomeAccess2::getBiome, chunkRandom, aquiferSampler, chunkPos2, carvingMask);
+                        // configuredCarver.carve(carverContext, chunk, biomeAccess2::getBiome, chunkRandom, aquiferSampler, chunkPos2, carvingMask);
                     }
 
                     l++;
@@ -336,7 +333,7 @@ public CompletableFuture<Chunk> populateNoise(Blender blender, NoiseConfig noise
         return k <= 0 ? CompletableFuture.completedFuture(chunk) : CompletableFuture.supplyAsync(Util.debugSupplier("wgen_fill_noise", () -> {
             int l = chunk.getSectionIndex(k * generationShapeConfig.verticalCellBlockCount() - 1 + i);
             int m = chunk.getSectionIndex(i);
-            Set<ChunkSection> set = Sets.<ChunkSection>newHashSet();
+            Set<ChunkSection> set = Sets.newHashSet();
 
             for (int n = l; n >= m; n--) {
                 ChunkSection chunkSection = chunk.getSection(n);

src/main/java/com/cyao/PaperChunkGenerator.java

@@ -24,7 +24,7 @@
 @Mixin(WorldPresets.Registrar.class)
 public abstract class WorldPresetMixin {
     @Unique
-    private static final RegistryKey<WorldPreset> PAPER_WORLD = RegistryKey.of(RegistryKeys.WORLD_PRESET, Identifier.of("flat-minecraft:2D-world"));
+    private static final RegistryKey<WorldPreset> PAPER_WORLD = RegistryKey.of(RegistryKeys.WORLD_PRESET, Identifier.of("flat-minecraft:paper-world"));
     @Shadow
     protected abstract void register(RegistryKey<WorldPreset> key, DimensionOptions dimensionOptions);
     @Shadow
@@ -33,7 +33,7 @@ public abstract class WorldPresetMixin {
     @Shadow @Final private RegistryEntryLookup<MultiNoiseBiomeSourceParameterList> multiNoisePresetLookup;
     @Shadow @Final private RegistryEntryLookup<ChunkGeneratorSettings> chunkGeneratorSettingsLookup;
 
-    @Inject(method = "bootstrap()V", at = @At("RETURN"))
+    @Inject(method = "bootstrap(Lnet/minecraft/world/biome/source/BiomeSource;)V", at = @At("RETURN"))
     private void addPresets(CallbackInfo ci) {
         RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> reference = this.multiNoisePresetLookup
                 .getOrThrow(MultiNoiseBiomeSourceParameterLists.OVERWORLD);

src/main/java/com/cyao/mixin/WorldPresetMixin.java

@@ -0,0 +1,3 @@
+{
+  "generator.flat-minecraft.paper-world": "2D Minecraft",
+}