Basic Pregenerator #121

Cardinalstars · 2024-10-03T01:14:07Z

More work will eventually be needed to make it better, but this works to generate a circle for now.

Will want to make a GUI to select the areas specifically and add a square generation area.

src/main/java/serverutils/pregenerator/ChunkLoaderManager.java

src/main/java/serverutils/pregenerator/filemanager/PregeneratorFileManager.java

Lyfts · 2024-10-03T16:07:52Z

src/main/java/serverutils/pregenerator/filemanager/PregeneratorFileManager.java

+
+    public PregeneratorFileManager(MinecraftServer server, double xLoc, double zLoc, int radius, int dimensionID)
+            throws IOException {
+        Path temporaryFileSaveFolder = Paths.get("saves").resolve(getWorldFolderPath(server).resolve(COMMAND_FOLDER));


I would prefer if the temp files are made in some subfolder of the serverutilities folder, if they're in the world folder and backups are running then all of the temp files will be zipped up.

Makes sense. I'll be sure to move those over. Just had it there for the moment.

I would prefer if the temp files are made in some subfolder of the serverutilities folder, if they're in the world folder and backups are running then all of the temp files will be zipped up.

So for pregeneration PR I have made, you mentioned you prefered to have the temp files in the server utilties folder. I think I'll need to make a separate folder in the serverutilties/server folder for each world. For servers this isn't an issue because there's only one world, but for clients that have multiple saves this would be an issue. So I can put it in the serverutilties/server/saves folder and have a folder for each save if you want. I don't know what's best so I thought I'd ask you.

Also, is having it in each backup not fine? If you're doing a pregen and you have to load the backup, you will still need to finish the pregen. Not sure on this.

I don't really mind it being in the world folder that much, but right now it's only in there in SP. Servers don't have a saves folder.

If you want it in the world folder you can use DimensionManager.getCurrentSaveRootDirectory() to get the actual root folder.

You can also use World.getSaveHandler().getWorldDirectory() if you want it in the dim folder

src/main/java/serverutils/pregenerator/ChunkLoaderManager.java

src/main/java/serverutils/handlers/ServerUtilitiesWorldEventHandler.java

src/main/resources/assets/serverutilities/lang/en_US.lang

src/main/java/serverutils/command/pregen/CmdStart.java

Lyfts · 2024-10-03T16:51:36Z

This is using impressively little ram to the point that there is definitely some wiggle room if you ever wanted it to go faster.

Cardinalstars · 2024-10-06T05:14:05Z

This is using impressively little ram to the point that there is definitely some wiggle room if you ever wanted it to go faster.

Weird things start happening when I up to 2 chunks per tick. I can do something like 2 chunks every other tick. Most testing will be required before I'm happy upping the speed. I can maybe add a config for how fast? It really might just depend on your system speed.

…ties-Cardinalstar

StoneLegion · 2024-11-27T23:39:14Z

IDK how hard it is, but all the in game generators have sucked tbh. They always miss something like lighting checks fluids movement, witchery walls around towns, etc.

The best one I found just rcon teleport the player around. That being said I wish that was just in game with SU doing the same idea without needing to use a tool. It be better at keeping track the player / position and such as well in case something derps up, etc.

Lyfts · 2024-12-02T14:08:33Z

src/main/java/serverutils/pregenerator/ChunkLoader.java

+        this.fileManager = fileManager;
+    }
+
+    public void processLoadChunk(MinecraftServer server, int dimensionId, Long chunk) {


That should be a primitive long

Lyfts · 2024-12-02T14:21:19Z

src/main/java/serverutils/pregenerator/ChunkLoaderManager.java

+                decisionTracker += 2 * (z - x) + 1;
+            }
+        }
+        System.out.printf("Found %s chunks to load", chunksToLoad.size());


This should be replaced with a proper logger

Lyfts · 2024-12-02T14:27:08Z

src/main/java/serverutils/pregenerator/filemanager/PregeneratorFileManager.java

+
+    public PregeneratorFileManager(MinecraftServer server, double xLoc, double zLoc, int radius, int dimensionID)
+            throws IOException {
+        Path temporaryFileSaveFolder = Paths.get("saves").resolve(getWorldFolderPath(server).resolve(COMMAND_FOLDER));


If you want it in the world folder you can use DimensionManager.getCurrentSaveRootDirectory() to get the actual root folder.

You can also use World.getSaveHandler().getWorldDirectory() if you want it in the dim folder

Lyfts · 2024-12-02T16:02:34Z

src/main/java/serverutils/command/pregen/CmdStart.java

+        if (sender instanceof MinecraftServer) {
+            return "commands." + ICommandWithParent.getCommandPath(this) + ".usage_server";
+        }
+
+        return "commands." + ICommandWithParent.getCommandPath(this) + ".usage_client";


These two lang keys don't actually exist in the lang file

Lyfts · 2024-12-02T16:14:38Z

[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: java.nio.file.FileSystemException: saves\New World-------------------\pregenerationFiles\fileIteration.tmp -> saves\New World-------------------\pregenerationFiles\fileIteration: The process cannot access the file because it is being used by another process
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:92)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at java.base/sun.nio.fs.WindowsFileCopy.move(WindowsFileCopy.java:328)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at java.base/sun.nio.fs.WindowsFileSystemProvider.move(WindowsFileSystemProvider.java:291)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at java.base/java.nio.file.Files.move(Files.java:1430)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//serverutils.pregenerator.filemanager.readwriters.SafeFileReadWriter.commit(SafeFileReadWriter.java:51)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//serverutils.pregenerator.filemanager.readwriters.SafeFileReadWriter.writeAndCommitIntAfterIterations(SafeFileReadWriter.java:30)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//serverutils.pregenerator.filemanager.PregeneratorFileManager.saveIteration(PregeneratorFileManager.java:68)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//serverutils.pregenerator.ChunkLoader.lambda$processLoadChunk$0(ChunkLoader.java:28)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraftforge.common.chunkio.ChunkIOProvider.callStage3(ChunkIOProvider.java:56)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraftforge.common.chunkio.ChunkIOProvider.callStage3(ChunkIOProvider.java:12)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraftforge.common.util.AsynchronousExecutor$Task.finish(AsynchronousExecutor.java:196)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraftforge.common.util.AsynchronousExecutor.finishActive(AsynchronousExecutor.java:354)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraftforge.common.chunkio.ChunkIOExecutor.tick(ChunkIOExecutor.java:30)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraft.server.MinecraftServer.updateTimeLightAndEntities(MinecraftServer.java:663)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraft.server.MinecraftServer.tick(MinecraftServer.java:614)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraft.server.integrated.IntegratedServer.tick(IntegratedServer.java:118)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraft.server.MinecraftServer.run(MinecraftServer.java:485)
[17:08:14] [Server thread/INFO] [STDERR]: [java.lang.Throwable$WrappedPrintStream:println:787]: 	at Launch//net.minecraft.server.MinecraftServer$2.run(MinecraftServer.java:752)
[17:08:14] [Server thread/ERROR] [FML]: Exception caught during firing event cpw.mods.fml.common.gameevent.TickEvent$ServerTickEvent@2fb6e890:
java.lang.IndexOutOfBoundsException: Index (27648) is greater than or equal to list size (27648)
	at Launch//it.unimi.dsi.fastutil.longs.LongArrayList.getLong(LongArrayList.java:341) ~[LongArrayList.class:?]
	at Launch//serverutils.pregenerator.ChunkLoaderManager.queueChunks(ChunkLoaderManager.java:156) ~[ChunkLoaderManager.class:?]
	at Launch//serverutils.handlers.ServerUtilitiesServerEventHandler.onServerTick(ServerUtilitiesServerEventHandler.java:240) ~[ServerUtilitiesServerEventHandler.class:?]
	at cpw.mods.fml.common.eventhandler.ASMEventHandler_25_ServerUtilitiesServerEventHandler_onServerTick_ServerTickEvent.invoke(.dynamic) ~[?:?]
	at Launch//cpw.mods.fml.common.eventhandler.ASMEventHandler.invoke(ASMEventHandler.java:54) ~[ASMEventHandler.class:?]
	at Launch//cpw.mods.fml.common.eventhandler.EventBus.post(EventBus.java:140) [EventBus.class:?]
	at Launch//cpw.mods.fml.common.FMLCommonHandler.onPostServerTick(FMLCommonHandler.java:247) [FMLCommonHandler.class:?]
	at Launch//net.minecraft.server.MinecraftServer.tick(MinecraftServer.java:657) [MinecraftServer.class:?]
	at Launch//net.minecraft.server.integrated.IntegratedServer.tick(IntegratedServer.java:118) [IntegratedServer.class:?]
	at Launch//net.minecraft.server.MinecraftServer.run(MinecraftServer.java:485) [MinecraftServer.class:?]
	at Launch//net.minecraft.server.MinecraftServer$2.run(MinecraftServer.java:752) [MinecraftServer$2.class:?]

crash-2024-12-02_17.08.14-server.txt
fml-client-3.log

I crashed when reloading a world that had a pregen running. It seems to happen consistently in SP if you exit to main menu and reload the world.

Lyfts · 2024-12-02T17:05:52Z

You can also simplify the chunk queuing a bit by using a LongArrayFIFOQueue aecaf5b

This both fixes the crash and provides an early return so that it won't find 500k chunks to load if only 10k of those still need to be loaded.

Cardinalstars and others added 3 commits October 2, 2024 20:11

Pregen

8065ff4

Spotless

6b8ad81

Merge branch 'master' into master

bd99a3e

Dream-Master requested review from Lyfts and a team October 3, 2024 08:18

Lyfts requested changes Oct 3, 2024

View reviewed changes

Lyfts reviewed Oct 3, 2024

View reviewed changes

src/main/java/serverutils/command/pregen/CmdStart.java Outdated Show resolved Hide resolved

chochem added the ongoing freeze - do not merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Oct 3, 2024

Cardinalstars added 3 commits October 7, 2024 01:08

Handling comments except for one

c917fa2

Merge branch 'master' of https://github.com/Cardinalstars/ServerUtili…

59c5456

…ties-Cardinalstar

I always forget spotless...

f675c88

Merge branch 'master' into master

bacc2f2

Dream-Master requested a review from a team November 28, 2024 18:09

Lyfts reviewed Dec 2, 2024

View reviewed changes

Dream-Master removed the ongoing freeze - do not merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Dec 8, 2024

Ethryan and others added 3 commits December 10, 2024 17:44

Merge branch 'master' into master

be95dba

Merge branch 'master' into master

2f75d5a

Merge branch 'master' into master

61d04f1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Basic Pregenerator #121

Basic Pregenerator #121

Cardinalstars commented Oct 3, 2024

Lyfts Oct 3, 2024

Cardinalstars Oct 4, 2024

Cardinalstars Dec 2, 2024

Lyfts Dec 2, 2024

Lyfts Dec 2, 2024 •

edited

Loading

Lyfts commented Oct 3, 2024

Cardinalstars commented Oct 6, 2024 •

edited

Loading

StoneLegion commented Nov 27, 2024

Lyfts Dec 2, 2024

Lyfts Dec 2, 2024

Lyfts Dec 2, 2024 •

edited

Loading

Lyfts Dec 2, 2024

Lyfts commented Dec 2, 2024

Lyfts commented Dec 2, 2024

Basic Pregenerator #121

Are you sure you want to change the base?

Basic Pregenerator #121

Conversation

Cardinalstars commented Oct 3, 2024

Lyfts Oct 3, 2024

Choose a reason for hiding this comment

Cardinalstars Oct 4, 2024

Choose a reason for hiding this comment

Cardinalstars Dec 2, 2024

Choose a reason for hiding this comment

Lyfts Dec 2, 2024

Choose a reason for hiding this comment

Lyfts Dec 2, 2024 • edited Loading

Choose a reason for hiding this comment

Lyfts commented Oct 3, 2024

Cardinalstars commented Oct 6, 2024 • edited Loading

StoneLegion commented Nov 27, 2024

Lyfts Dec 2, 2024

Choose a reason for hiding this comment

Lyfts Dec 2, 2024

Choose a reason for hiding this comment

Lyfts Dec 2, 2024 • edited Loading

Choose a reason for hiding this comment

Lyfts Dec 2, 2024

Choose a reason for hiding this comment

Lyfts commented Dec 2, 2024

Lyfts commented Dec 2, 2024

Lyfts Dec 2, 2024 •

edited

Loading

Cardinalstars commented Oct 6, 2024 •

edited

Loading

Lyfts Dec 2, 2024 •

edited

Loading