build: 25w37a

Author: ishland

c2me-rewrites-chunk-serializer/src/main/java/com/ishland/c2me/rewrites/chunk_serializer/common/ChunkDataSerializer.java

@@ -12,7 +12,6 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.class_11897;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
@@ -40,6 +39,7 @@
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkType;
 import net.minecraft.world.chunk.PalettedContainer;
+import net.minecraft.world.chunk.PalettesFactory;
 import net.minecraft.world.chunk.ReadableContainer;
 import net.minecraft.world.chunk.SerializedChunk;
 import net.minecraft.world.chunk.UpgradeData;
@@ -183,7 +183,7 @@ public static void write(SerializedChunk serializable, NbtWriter writer) {
 
         List<SerializedChunk.SectionData> sectionData = serializable.sectionData();
 
-        class_11897 containerFactory = serializable.containerFactory();
+        PalettesFactory containerFactory = serializable.containerFactory();
 
         checkLightFlag(serializable.lightCorrect(), writer);
 
@@ -261,7 +261,7 @@ private static void writeSectionData(
             NbtWriter writer,
             ChunkPos chunkPos,
             List<SerializedChunk.SectionData> sectionData,
-            class_11897 containerFactory
+            PalettesFactory containerFactory
     ) {
         writeSectionDataVanilla(writer, chunkPos, sectionData, containerFactory);
     }
@@ -273,7 +273,7 @@ private static void writeSectionDataVanilla(
             NbtWriter writer,
             ChunkPos chunkPos,
             List<SerializedChunk.SectionData> sectionData,
-            class_11897 containerFactory
+            PalettesFactory containerFactory
     ) {
         long sectionsStart = writer.startList(STRING_SECTIONS, NbtElement.COMPOUND_TYPE);
         int sectionCount = 0;
@@ -328,7 +328,7 @@ private static void writeSectionDataVanilla(
      * {@link Blocks#AIR}{@code .getDefaultState()} as defaultValue
      */
     @SuppressWarnings("unchecked")
-    private static void writeBlockStates(NbtWriter writer, PalettedContainer<BlockState> blockStateContainer, class_11897 containerFactory) {
+    private static void writeBlockStates(NbtWriter writer, PalettedContainer<BlockState> blockStateContainer, PalettesFactory containerFactory) {
         writer.startCompound(STRING_BLOCK_STATES);
         // todo can this be optimized?
         // todo: does this conflict with lithium by any chance?
@@ -365,7 +365,7 @@ private static void writeBlockStates(NbtWriter writer, PalettedContainer<BlockSt
      * {@link PalettedContainer.PaletteProvider#BIOME} as paletteProvider,
      * {@link BiomeKeys#PLAINS} as defaultValue
      */
-    private static void writeBiomes(NbtWriter writer, ReadableContainer<RegistryEntry<Biome>> biomeContainer, class_11897 containerFactory) {
+    private static void writeBiomes(NbtWriter writer, ReadableContainer<RegistryEntry<Biome>> biomeContainer, PalettesFactory containerFactory) {
         writer.startCompound(STRING_BIOMES);
         // todo can this be optimized?
         // todo: does this conflict with lithium by any chance?

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ReadFromDisk.java

@@ -116,7 +116,7 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
             final ServerWorld world = ((IThreadedAnvilChunkStorage) context.tacs()).getWorld();
             // blending
             final ChunkPos pos = context.holder().getKey();
-            protoChunk = protoChunk != null ? protoChunk : new ProtoChunk(pos, UpgradeData.NO_UPGRADE_DATA, world, world.method_74142(), null);
+            protoChunk = protoChunk != null ? protoChunk : new ProtoChunk(pos, UpgradeData.NO_UPGRADE_DATA, world, world.getPalettesFactory(), null);
             if (protoChunk.getBelowZeroRetrogen() != null || protoChunk.getStatus().getChunkType() == ChunkType.PROTOCHUNK) {
                 ProtoChunk finalProtoChunk = protoChunk;
                 return Single.defer(() -> Single.fromCompletionStage(BlendingInfoUtil.getBlendingInfos(((IVersionedChunkStorage) context.tacs()).getWorker(), pos)))
@@ -133,7 +133,7 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
                 .map(optional -> optional.map(nbtCompound -> {
                     try (var ignored = ThreadInstrumentation.getCurrent().begin(new ChunkTaskWork(context, this, true))) {
                         ServerWorld world = ((IThreadedAnvilChunkStorage) context.tacs()).getWorld();
-                        SerializedChunk chunkSerializer = SerializedChunk.fromNbt(world, world.method_74142(), nbtCompound);
+                        SerializedChunk chunkSerializer = SerializedChunk.fromNbt(world, world.getPalettesFactory(), nbtCompound);
                         if (chunkSerializer == null) {
                             LOGGER.error("Chunk file at {} is missing level data, skipping", context.holder().getKey());
                         }
@@ -150,7 +150,7 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
     protected @NotNull ProtoChunk createEmptyProtoChunk(ChunkLoadingContext context) {
         try (var ignored = ThreadInstrumentation.getCurrent().begin(new ChunkTaskWork(context, this, true))) {
             final ServerWorld world = ((IThreadedAnvilChunkStorage) context.tacs()).getWorld();
-            return new ProtoChunk(context.holder().getKey(), UpgradeData.NO_UPGRADE_DATA, world, world.method_74142(), null);
+            return new ProtoChunk(context.holder().getKey(), UpgradeData.NO_UPGRADE_DATA, world, world.getPalettesFactory(), null);
         }
     }
 

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.warning.mode=all
 #org.gradle.configuration-cache=true
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=25w36b
-yarn_mappings=25w36b+build.1
+minecraft_version=25w37a
+yarn_mappings=25w37a+build.1
 loader_version=0.17.2
 fabric_version=0.132.0+1.21.9
 # Mod Properties