Skip to content

Commit

Permalink
Remove platform specific world managers
Browse files Browse the repository at this point in the history
  • Loading branch information
Yeregorix committed Feb 25, 2025
1 parent 0dedf5b commit 1a9cb44
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 289 deletions.
4 changes: 0 additions & 4 deletions forge/src/main/java/org/spongepowered/forge/ForgeServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
package org.spongepowered.forge;

import org.spongepowered.common.SpongeServer;
import org.spongepowered.forge.world.server.ForgeWorldManager;

public interface ForgeServer extends ForgeEngine, SpongeServer {

@Override
ForgeWorldManager worldManager();
}

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion forge/src/mixins/resources/mixins.spongeforge.api.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"package": "org.spongepowered.forge.mixin.api",
"priority": 1300,
"mixins": [
"minecraft.server.MinecraftServerMixin_Forge_API"
],
"overwrites": {
"conformVisibility": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
package org.spongepowered.neoforge;

import org.spongepowered.common.SpongeServer;
import org.spongepowered.neoforge.world.server.NeoWorldManager;

public interface NeoServer extends NeoEngine, SpongeServer {

@Override
NeoWorldManager worldManager();
}

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion neoforge/src/mixins/resources/mixins.spongeneo.api.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"package": "org.spongepowered.neoforge.mixin.api",
"priority": 1300,
"mixins": [
"minecraft.server.MinecraftServerMixin_Neo_API"
],
"overwrites": {
"conformVisibility": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

public abstract class SpongeWorldManager implements WorldManager {
public class SpongeWorldManager implements WorldManager {

private final MinecraftServer server;
private final Path defaultWorldDirectory, customWorldsDirectory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.mojang.datafixers.DataFixer;
import com.llamalad7.mixinextras.sugar.Local;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.audience.MessageType;
import net.kyori.adventure.identity.Identity;
Expand All @@ -38,11 +38,9 @@
import net.minecraft.core.registries.Registries;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerScoreboard;
import net.minecraft.server.Services;
import net.minecraft.server.WorldStem;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
import net.minecraft.server.packs.repository.PackRepository;
import net.minecraft.server.players.PlayerList;
import net.minecraft.world.level.levelgen.WorldDimensions;
Expand Down Expand Up @@ -101,7 +99,6 @@
import org.spongepowered.common.world.teleport.SpongeTeleportHelper;

import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -151,6 +148,7 @@ public abstract class MinecraftServerMixin_API implements SpongeServer, SpongeRe

private Iterable<? extends Audience> audiences;
private ServerScheduler api$scheduler;
private SpongeWorldManager api$worldManager;
private SpongeTeleportHelper api$teleportHelper;
private SpongePlayerDataManager api$playerDataHandler;
private UsernameCache api$usernameCache;
Expand All @@ -164,15 +162,14 @@ public abstract class MinecraftServerMixin_API implements SpongeServer, SpongeRe
private final BlockDestructionIdCache api$blockDestructionIdCache = new BlockDestructionIdCache(0, AtomicInteger::decrementAndGet);

@Inject(method = "<init>", at = @At("TAIL"))
public void api$initializeSpongeFieldsfinal(final Thread $$0, final LevelStorageSource.LevelStorageAccess $$1, final PackRepository $$2, final WorldStem $$3, final Proxy $$4,
final DataFixer $$5, final Services $$6, final ChunkProgressListenerFactory $$7, final CallbackInfo ci) {
public void api$initializeSpongeFieldsfinal(final CallbackInfo ci, @Local(argsOnly = true) final WorldStem levelStem) {
this.api$scheduler = new ServerScheduler();
this.api$worldManager = new SpongeWorldManager((MinecraftServer) (Object) this);
this.api$playerDataHandler = new SpongePlayerDataManager(this);
this.api$teleportHelper = new SpongeTeleportHelper();
this.api$mapStorage = new SpongeMapStorage();
this.api$registryHolder = new RegistryHolderLogic($$3.registries().compositeAccess());
this.api$registryHolder = new RegistryHolderLogic(levelStem.registries().compositeAccess());
this.api$userManager = new SpongeUserManager((MinecraftServer) (Object) this);

this.api$dataPackManager = new SpongeDataPackManager((MinecraftServer) (Object) this, this.storageSource.getLevelPath(LevelResource.DATAPACK_DIR));
}

Expand Down Expand Up @@ -274,7 +271,7 @@ public boolean isAnimalSpawnsEnabled() {
}

/**
* See {@link SpongeWorldManager#loadLevel()}
* See {@link SpongeWorldManager}
*/
@Override
public boolean isMultiWorldEnabled() {
Expand All @@ -296,6 +293,11 @@ public SpongeUserManager userManager() {
return this.api$userManager;
}

@Override
public SpongeWorldManager worldManager() {
return this.api$worldManager;
}

@Override public TeleportHelper teleportHelper() {
return this.api$teleportHelper;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
package org.spongepowered.vanilla;

import org.spongepowered.common.SpongeServer;
import org.spongepowered.common.world.server.SpongeWorldManager;

public interface VanillaServer extends VanillaEngine, SpongeServer {

@Override
SpongeWorldManager worldManager();
}

This file was deleted.

Loading

0 comments on commit 1a9cb44

Please sign in to comment.