From 9c46dcbb94ede838b662dee07e0165f06eec1bdd Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 24 Oct 2024 07:08:02 -0700 Subject: [PATCH] Remove unused read/write methods on ChunkSystemSectionStorage As with the last commit, these were only used in the legacy region file I/O code and as such there is no reason to maintain them. --- .../mixin/chunk_system/PoiManagerMixin.java | 16 ---------------- .../mixin/chunk_system/SectionStorageMixin.java | 3 +++ .../level/storage/ChunkSystemSectionStorage.java | 5 ----- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiManagerMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiManagerMixin.java index 1495237..271ba80 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiManagerMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiManagerMixin.java @@ -266,20 +266,4 @@ public abstract class PoiManagerMixin extends SectionStorage imp private Stream skipLoadedSet(final Stream instance, final Predicate predicate) { return instance; } - - @Override - public final void moonrise$close() throws IOException {} - - @Override - public final CompoundTag moonrise$read(final int chunkX, final int chunkZ) throws IOException { - return MoonriseRegionFileIO.loadData( - this.world, chunkX, chunkZ, MoonriseRegionFileIO.RegionFileType.POI_DATA, - MoonriseRegionFileIO.getIOBlockingPriorityForCurrentThread() - ); - } - - @Override - public final void moonrise$write(final int chunkX, final int chunkZ, final CompoundTag data) throws IOException { - MoonriseRegionFileIO.scheduleSave(this.world, chunkX, chunkZ, data, MoonriseRegionFileIO.RegionFileType.POI_DATA); - } } diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/SectionStorageMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/SectionStorageMixin.java index 6a5f3ea..9fb6cfa 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/SectionStorageMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/SectionStorageMixin.java @@ -35,6 +35,9 @@ abstract class SectionStorageMixin implements ChunkSystemSectionStorage, A return this.storage; } + @Override + public void moonrise$close() throws IOException {} + /** * @reason Retrieve storage from IOWorker, and then nuke it * @author Spottedleaf diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/storage/ChunkSystemSectionStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/storage/ChunkSystemSectionStorage.java index 23bd741..128f795 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/storage/ChunkSystemSectionStorage.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/storage/ChunkSystemSectionStorage.java @@ -1,15 +1,10 @@ package ca.spottedleaf.moonrise.patches.chunk_system.level.storage; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.chunk.storage.RegionFileStorage; import java.io.IOException; public interface ChunkSystemSectionStorage { - public CompoundTag moonrise$read(final int chunkX, final int chunkZ) throws IOException; - - public void moonrise$write(final int chunkX, final int chunkZ, final CompoundTag data) throws IOException; - public RegionFileStorage moonrise$getRegionStorage(); public void moonrise$close() throws IOException;