Skip to content

Fix: Refactor world initialization with unified DistValidate checks #2070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
titan0115 wants to merge 3 commits into
base: FeudalKings
Choose a base branch
from
Open

Fix: Refactor world initialization with unified DistValidate checks #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
227c73b
Refactor world initialization in MinecraftServerMixin to use Redirect…
titan0115 Jan 11, 2026
40ee364
Refactor ServerLevelMixin to replace arclight$isActual() checks with …
titan0115 Jan 11, 2026
3c183c6
Update LevelMixin to utilize DistValidate.isValid() for arclight$isAc…
titan0115 Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions ...common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
Expand Down Expand Up @@ -279,25 +280,30 @@ private void executeModerately() {
return new ArclightDelegatedBorderListener(arg, (BorderChangeListener.DelegateBorderChangeListener) DecorationOps.callsite().invoke(arg));
}

@Decorate(method = "createLevels", at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
private Object arclight$worldInit(Map<Object, Object> instance, Object k, Object v, ChunkProgressListener chunkProgressListener) throws Throwable {
if (v instanceof ServerLevel level) {
if (((CraftServer) Bukkit.getServer()).scoreboardManager == null) {
((CraftServer) Bukkit.getServer()).scoreboardManager = new CraftScoreboardManager((MinecraftServer) (Object) this, level.getScoreboard());
}
if (((WorldBridge) level).bridge$getGenerator() != null) {
level.bridge$getWorld().getPopulators().addAll(
((WorldBridge) level).bridge$getGenerator().getDefaultPopulators(
level.bridge$getWorld()));
}
Bukkit.getPluginManager().callEvent(new WorldInitEvent(level.bridge$getWorld()));

// Arclight: move world border listener initialization to world registration
// Arclight: ArclightBorderChangeListener is singleton so won't be added more than once
// Arclight: since it seems that we can't apply multiple Decorators to a target on Forge...
level.getWorldBorder().addListener(ArclightBorderChangeListener.typed());
@SuppressWarnings("rawtypes")
@Redirect(method = "createLevels", at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
private Object arclight$worldInit(Map instance, Object key, Object value) {
ResourceKey<Level> k = (ResourceKey<Level>) key;
ServerLevel level = (ServerLevel) value;

Object result = instance.put(k, level);

if (((CraftServer) Bukkit.getServer()).scoreboardManager == null) {
((CraftServer) Bukkit.getServer()).scoreboardManager = new CraftScoreboardManager((MinecraftServer) (Object) this, level.getScoreboard());
}
return DecorationOps.callsite().invoke(instance, k, v);
if (((WorldBridge) level).bridge$getGenerator() != null) {
level.bridge$getWorld().getPopulators().addAll(
((WorldBridge) level).bridge$getGenerator().getDefaultPopulators(
level.bridge$getWorld()));
}
Bukkit.getPluginManager().callEvent(new WorldInitEvent(level.bridge$getWorld()));

// Arclight: move world border listener initialization to world registration
// Arclight: ArclightBorderChangeListener is singleton so won't be added more than once
// Arclight: since it seems that we can't apply multiple Decorators to a target on Forge...
level.getWorldBorder().addListener(ArclightBorderChangeListener.typed());

return result;
}

/**
Expand Down
12 changes: 6 additions & 6 deletions ...mmon/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,14 @@ public ResourceKey<LevelStem> getTypeKey() {
@Decorate(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/dimension/LevelStem;generator()Lnet/minecraft/world/level/chunk/ChunkGenerator;"))
private ChunkGenerator arclight$initChunkGenerator(LevelStem instance, @Local(ordinal = -1) MinecraftServer server, @Local(ordinal = -1) ServerLevelData worldInfo) throws Throwable {
// Pulling up world info init since level info is used when selecting ChunkGenerator.
if (arclight$isActual() && worldInfo instanceof PrimaryLevelData primary) {
if (DistValidate.isValid(this) && worldInfo instanceof PrimaryLevelData primary) {
this.K = primary;
} else {
// damn spigot again
this.K = DelegateWorldInfo.wrap(worldInfo);
}

if (arclight$isActual()) {
if (DistValidate.isValid(this)) {
var craftBridge = (CraftServerBridge) (Object) ((MinecraftServerBridge) server).bridge$getServer();

this.biomeProvider = craftBridge.bridge$consumeBiomeProviderCache(worldInfo.getLevelName());
Expand All @@ -200,7 +200,7 @@ public ResourceKey<LevelStem> getTypeKey() {
}

ChunkGenerator raw = (ChunkGenerator) DecorationOps.callsite().invoke(instance);
if (arclight$isActual()) {
if (DistValidate.isValid(this)) {
// Data needed by getWorld() are all initialized for possible creating CraftWorld.
// CraftBukkit start: select custom chunk generator
if (biomeProvider != null) {
Expand Down Expand Up @@ -230,7 +230,7 @@ public ResourceKey<LevelStem> getTypeKey() {
private void arclight$init(MinecraftServer minecraftServer, Executor backgroundExecutor, LevelStorageSource.LevelStorageAccess levelSave, ServerLevelData worldInfo, ResourceKey<Level> dimension, LevelStem levelStem, ChunkProgressListener statusListener, boolean isDebug, long seed, List<CustomSpawner> specialSpawners, boolean shouldBeTicking, RandomSequences seq, CallbackInfo ci) {
this.pvpMode = minecraftServer.isPvpAllowed();
this.convertable = levelSave;
if (arclight$isActual() && this.dragonFight == null && this.environment == World.Environment.THE_END) {
if (DistValidate.isValid(this) && this.dragonFight == null && this.environment == World.Environment.THE_END) {
this.dragonFight = new EndDragonFight((ServerLevel)(Object) this, K.worldGenOptions().seed(), K.endDragonFightData());
}
var typeKey = ((LevelStorageSourceBridge.LevelStorageAccessBridge) levelSave).bridge$getTypeKey();
Expand All @@ -256,7 +256,7 @@ public ResourceKey<LevelStem> getTypeKey() {
this.uuid = WorldUUID.getUUID(levelSave.getDimensionPath(this.dimension()).toFile());
((ServerChunkProviderBridge) this.chunkSource).bridge$setViewDistance(spigotConfig.viewDistance);
((ServerChunkProviderBridge) this.chunkSource).bridge$setSimulationDistance(spigotConfig.simulationDistance);
if (arclight$isActual()) {
if (DistValidate.isValid(this)) {
((WorldInfoBridge) this.K).bridge$setWorld((ServerLevel) (Object) this);
var data = this.getDataStorage().computeIfAbsent(LevelPersistentData.factory(), "bukkit_pdc");
this.getWorld().readBukkitValues(data.getTag());
Expand Down Expand Up @@ -447,7 +447,7 @@ public <T extends ParticleOptions> int sendParticles(T type, double posX, double
return;
}
CreatureSpawnEvent.SpawnReason spawnReason = reason == null ? CreatureSpawnEvent.SpawnReason.DEFAULT : reason;
if (!arclight$isActual()) {
if (!DistValidate.isValid(this)) {
return;
}
((EntityBridge) entityIn).arclight$onAddedToLevel();
Expand Down
3 changes: 2 additions & 1 deletion ...ight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.izzel.arclight.common.mod.mixins.annotation.TransformAccess;
import io.izzel.arclight.common.mod.server.world.ArclightWorldConfig;
import io.izzel.arclight.common.mod.util.ArclightCaptures;
import io.izzel.arclight.common.mod.util.DistValidate;
import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
Expand Down Expand Up @@ -114,7 +115,7 @@ public abstract class LevelMixin implements WorldBridge, LevelAccessor, LevelWri
// InitAuther97: unsafe = true can't be removed because unsafe is default to false on Forge
@Inject(method = "<init>", at = @At(value = "CTOR_HEAD", unsafe = true))
private void arclight$preInit(WritableLevelData writableLevelData, ResourceKey resourceKey, RegistryAccess registryAccess, Holder holder, Supplier supplier, boolean bl, boolean bl2, long l, int i, CallbackInfo ci) {
this.arclight$isActual = WorldBridge.super.arclight$isActual();
this.arclight$isActual = DistValidate.isValid((LevelAccessor) this);
}

// InitAuther97: inject later than ironsspellbooks, see their LevelMixin
Expand Down