From 5702e1d30c40c5ddd2a843e6a4c86a89d4f9620c Mon Sep 17 00:00:00 2001 From: MrLetsplay Date: Sun, 31 Dec 2023 01:16:14 +0100 Subject: [PATCH] Clean up code, 1.20.x compatibility --- .../java/me/mrletsplay/archiveserver/ArchiveServer.java | 4 ++-- .../me/mrletsplay/archiveserver/mixin/ChunkStatusMixin.java | 6 ------ .../me/mrletsplay/archiveserver/mixin/POISaveMixin.java | 1 - src/main/resources/fabric.mod.json | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/mrletsplay/archiveserver/ArchiveServer.java b/src/main/java/me/mrletsplay/archiveserver/ArchiveServer.java index 95ce4c9..db9d9d0 100644 --- a/src/main/java/me/mrletsplay/archiveserver/ArchiveServer.java +++ b/src/main/java/me/mrletsplay/archiveserver/ArchiveServer.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.stream.StreamSupport; -import org.apache.commons.lang3.stream.Streams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public class ArchiveServer implements ModInitializer { Gson gson = new Gson(); JsonObject object = gson.fromJson(Files.readString(WORLDS_CONFIG, StandardCharsets.UTF_8), JsonObject.class); - worlds = Streams.of(object.getAsJsonArray("worlds").iterator()).map(e -> e.getAsString()).toList(); + worlds = StreamSupport.stream(object.getAsJsonArray("worlds").spliterator(), false).map(e -> e.getAsString()).toList(); LOGGER.info("ArchiveServer config loaded!"); LOGGER.info("Archived worlds: " + worlds); }catch(IOException | JsonParseException e) { diff --git a/src/main/java/me/mrletsplay/archiveserver/mixin/ChunkStatusMixin.java b/src/main/java/me/mrletsplay/archiveserver/mixin/ChunkStatusMixin.java index d5278fd..9b84af7 100644 --- a/src/main/java/me/mrletsplay/archiveserver/mixin/ChunkStatusMixin.java +++ b/src/main/java/me/mrletsplay/archiveserver/mixin/ChunkStatusMixin.java @@ -72,12 +72,6 @@ public class ChunkStatusMixin { }else { callback.setReturnValue(CompletableFuture.completedFuture(Either.left(theChunk))); } - -// callback.setReturnValue(ChunkHolder.UNLOADED_CHUNK_FUTURE); -// WorldChunk -// callback.setReturnValue(ChunkStatus.EMPTY.runGenerationTask(executor, world, generator, structureTemplateManager, lightingProvider, fullChunkConverter, chunks)); -// callback.setReturnValue(CompletableFuture.completedFuture(Either.left(chunks.get(chunks.size() / 2)))); -// callback.setReturnValue(CompletableFuture.completedFuture(Either.left(new WorldChunk(world, new ChunkPos(0, 0))))); } } diff --git a/src/main/java/me/mrletsplay/archiveserver/mixin/POISaveMixin.java b/src/main/java/me/mrletsplay/archiveserver/mixin/POISaveMixin.java index 57b2436..84572b7 100644 --- a/src/main/java/me/mrletsplay/archiveserver/mixin/POISaveMixin.java +++ b/src/main/java/me/mrletsplay/archiveserver/mixin/POISaveMixin.java @@ -23,7 +23,6 @@ public class POISaveMixin { World world = (World) ((SerializingRegionBasedStorageAccessor) this).getWorld(); if(!ArchiveServer.isArchived(world.getRegistryKey().getValue())) return; - System.out.println(world.getRegistryKey().getValue().toString()); callback.cancel(); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bde2cd3..5dc11d4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ ], "depends": { "fabricloader": ">=0.15.3", - "minecraft": "~1.20.4", + "minecraft": "~1.20", "java": ">=17", "fabric-api": "*" },