From 6b2410564018f00c876ba7b485ce41e94f687dfe Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Thu, 11 Jun 2026 20:35:46 -0400 Subject: [PATCH] World Manager Seam --- .../src/main/java/art/arcane/iris/Iris.java | 9 ++++++++ .../art/arcane/iris/engine/IrisEngine.java | 3 +-- .../framework/EngineWorldManagerProvider.java | 23 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 core/src/main/java/art/arcane/iris/engine/framework/EngineWorldManagerProvider.java diff --git a/adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java b/adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java index 634f92aa5..166869478 100644 --- a/adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java +++ b/adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java @@ -18,6 +18,10 @@ package art.arcane.iris; +import art.arcane.iris.engine.IrisWorldManager; + +import art.arcane.iris.engine.framework.EngineWorldManagerProvider; + import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; @@ -592,6 +596,11 @@ public class Iris extends VolmitPlugin implements Listener, ReloadAware { tickets = new ChunkTickets(); linkMultiverseCore = new MultiverseCoreLink(); IrisServices.register(MultiverseCoreLink.class, linkMultiverseCore); + IrisServices.register(EngineWorldManagerProvider.class, (EngineWorldManagerProvider) (Engine engine) -> { + IrisWorldManager manager = new IrisWorldManager(engine); + manager.startManager(); + return manager; + }); IrisServices.register(art.arcane.iris.core.runtime.WorldDeletionQueue.class, (art.arcane.iris.core.runtime.WorldDeletionQueue) Iris::queueWorldDeletionOnStartup); settingsFile = getDataFile("settings.json"); configHotloadEngine = new ConfigHotloadEngine( diff --git a/core/src/main/java/art/arcane/iris/engine/IrisEngine.java b/core/src/main/java/art/arcane/iris/engine/IrisEngine.java index 91368b39f..b171dbf49 100644 --- a/core/src/main/java/art/arcane/iris/engine/IrisEngine.java +++ b/core/src/main/java/art/arcane/iris/engine/IrisEngine.java @@ -244,9 +244,8 @@ public class IrisEngine implements Engine { setupMode(); IrisLogging.debug("[IrisEngine timing] setupMode=" + (M.ms() - t0) + "ms"); t0 = M.ms(); - IrisWorldManager manager = new IrisWorldManager(this); + EngineWorldManager manager = IrisServices.get(EngineWorldManagerProvider.class).create(this); worldManager = manager; - manager.startManager(); IrisLogging.debug("[IrisEngine timing] IrisWorldManager=" + (M.ms() - t0) + "ms"); J.a(this::computeBiomeMaxes); J.a(() -> { diff --git a/core/src/main/java/art/arcane/iris/engine/framework/EngineWorldManagerProvider.java b/core/src/main/java/art/arcane/iris/engine/framework/EngineWorldManagerProvider.java new file mode 100644 index 000000000..cdf617f35 --- /dev/null +++ b/core/src/main/java/art/arcane/iris/engine/framework/EngineWorldManagerProvider.java @@ -0,0 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2026 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package art.arcane.iris.engine.framework; + +public interface EngineWorldManagerProvider { + EngineWorldManager create(Engine engine); +}