ported to vs 2.4

Author: zyxkad

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -146,6 +146,7 @@ repositories {
 			includeGroup('com.jamieswhiteshirt')
 		}
 	}
+
 	exclusiveContent {
 		forRepository {
 			maven {

common/build.gradle

@@ -25,11 +25,11 @@ dependencies {
 	annotationProcessor "com.google.auto.service:auto-service:1.1.1"
 
 	modApi "org.valkyrienskies:valkyrienskies-120-common:${vs2_version}"
-
 	implementation "org.valkyrienskies.core:api:${vs_core_version}"
-	implementation "org.valkyrienskies.core:api-game:${vs_core_version}"
-	implementation "org.valkyrienskies.core:util:${vs_core_version}"
 	implementation "org.valkyrienskies.core:impl:${vs_core_version}"
+	implementation "org.valkyrienskies.core:internal:${vs_core_version}"
+	implementation "org.valkyrienskies.core:util:${vs_core_version}"
+
 	modImplementation "com.github.litermc.vtil:vtil-common-${minecraft_version}:${vtil_version}"
 
 	compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-common:${cct_version}"

common/src/main/java/com/github/litermc/vschunkloader/Constants.java

@@ -6,7 +6,7 @@
 public final class Constants {
 	public static final String MOD_ID = "vschunkloader";
 	public static final String MOD_NAME = "VSChunkLoader";
-	public static final String MOD_VERSION = "1.5.0";
+	public static final String MOD_VERSION = "2.0.0";
 	public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME);
 
 	private Constants() {}

common/src/main/java/com/github/litermc/vschunkloader/VSCApi.java

@@ -121,14 +121,6 @@ public static boolean isForceLoadedBy(final MinecraftServer server, final long i
 		return ForceLoadAttachment.get(ship).isForceLoadedBy(token);
 	}
 
-	public static boolean canFreezeShipForChunkLoad(final ServerShip ship) {
-		return switch (Config.shipFreezing) {
-			case ALL -> true;
-			case NONE -> false;
-			case AMMO -> ship.getAttachment(AmmoShipAttachment.class) != null;
-		};
-	}
-
 	private static ServerShip getShip(final MinecraftServer server, final long id) {
 		final ServerShipWorld shipWorld = VSGameUtilsKt.getShipObjectWorld(server);
 		final ServerShip ship = shipWorld.getLoadedShips().getById(id);

common/src/main/java/com/github/litermc/vschunkloader/VSCListeners.java

@@ -1,6 +1,7 @@
 package com.github.litermc.vschunkloader;
 
-import com.github.litermc.vschunkloader.attachment.ChunkSensorAttachment;
+import com.github.litermc.vschunkloader.attachment.AmmoShipAttachment;
+import com.github.litermc.vschunkloader.attachment.ForceLoadAttachment;
 import com.github.litermc.vschunkloader.config.Config;
 import com.github.litermc.vschunkloader.util.ChunkLoaderManager;
 import com.github.litermc.vschunkloader.util.ChunkSensor;
@@ -17,10 +18,21 @@
 import org.valkyrienskies.core.api.ships.ServerShip;
 import org.valkyrienskies.core.api.world.ServerShipWorld;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
+import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
 
 public final class VSCListeners {
 	private VSCListeners() {}
 
+	public static void onModInit() {
+		VSCRegistry.register();
+		registerAttachments();
+	}
+
+	private static void registerAttachments() {
+		ValkyrienSkiesMod.getApi().registerAttachment(AmmoShipAttachment.class);
+		ValkyrienSkiesMod.getApi().registerAttachment(ForceLoadAttachment.class);
+	}
+
 	public static void onServerLevelLoad(final ServerLevel level) {
 		ChunkLoaderManager.get(level);
 	}
@@ -46,10 +58,6 @@ public static void preServerTick(final MinecraftServer server) {
 			}
 			ChunkLoaderManager.get(level).refreshForcedShip(ship);
 		}
-
-		for (final LoadedServerShip ship : shipWorld.getLoadedShips()) {
-			ChunkSensorAttachment.get(ship).serverTick(ship);
-		}
 	}
 
 	public static void postServerTick(final MinecraftServer server) {

common/src/main/java/com/github/litermc/vschunkloader/attachment/AmmoShipAttachment.java

@@ -3,73 +3,51 @@
 import com.github.litermc.vschunkloader.Constants;
 import com.github.litermc.vschunkloader.VSCApi;
 import com.github.litermc.vschunkloader.config.Config;
-import com.github.litermc.vschunkloader.platform.PlatformHelper;
 import com.github.litermc.vschunkloader.util.TaskUtil;
 import com.github.litermc.vtil.api.assemble.ShipAllocator;
-import com.github.litermc.vtil.util.LevelUtil;
+import com.github.litermc.vtil.api.attachment.IServerTickListener;
 
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import org.valkyrienskies.core.api.ships.LoadedServerShip;
 import org.valkyrienskies.core.api.ships.ServerShip;
-import org.valkyrienskies.core.api.ships.ServerTickListener;
-import org.valkyrienskies.core.apigame.world.ServerShipWorldCore;
-import org.valkyrienskies.mod.common.VSGameUtilsKt;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import org.valkyrienskies.core.impl.game.ships.ShipData;
 
 @JsonAutoDetect(
 	fieldVisibility = JsonAutoDetect.Visibility.NONE,
 	isGetterVisibility = JsonAutoDetect.Visibility.NONE,
 	getterVisibility = JsonAutoDetect.Visibility.NONE,
 	setterVisibility = JsonAutoDetect.Visibility.NONE
 )
-public final class AmmoShipAttachment implements ServerTickListener {
+public final class AmmoShipAttachment implements IServerTickListener {
 	private static final ResourceLocation AMMO_SHIP_TICKET = new ResourceLocation(Constants.MOD_ID, "ammo_ship");
 
-	private final MinecraftServer server;
-	private final ServerShipWorldCore world;
-	private long shipId;
 	private int activatedTick;
 	private boolean unmanaged = false;
 	private boolean deactivated = false;
 
-	public AmmoShipAttachment() {
-		this(-1);
-	}
-
-	private AmmoShipAttachment(final long shipId) {
-		this.server = PlatformHelper.get().getCurrentServer();
-		this.world = VSGameUtilsKt.getShipObjectWorld(this.server);
-		this.shipId = shipId;
-	}
+	public AmmoShipAttachment() {}
 
 	public static AmmoShipAttachment create(final ServerShip ship) {
-		final AmmoShipAttachment attachment = new AmmoShipAttachment(ship.getId());
-		ship.saveAttachment(AmmoShipAttachment.class, attachment);
+		final AmmoShipAttachment attachment = new AmmoShipAttachment();
+		if (ship instanceof final LoadedServerShip loadedShip) {
+			loadedShip.setAttachment(attachment);
+			return attachment;
+		} else if (ship instanceof final ShipData shipData) {
+			final var attachmentHolder = shipData.getAttachmentHolder();
+			attachmentHolder.setAttachment(attachment);
+		} else {
+			throw new IllegalArgumentException("ship is neither LoadedServerShip nor ShipData");
+		}
 		return attachment;
 	}
 
-	@JsonGetter("shipId")
-	private long getShipId() {
-		return this.shipId;
-	}
-
-	@JsonSetter("shipId")
-	private void setShipId(final long shipId) {
-		this.shipId = shipId;
-	}
-
 	@JsonGetter("activatedTick")
-	private long getActivatedTick() {
+	private int getActivatedTick() {
 		return this.activatedTick;
 	}
 
@@ -79,15 +57,15 @@ private void setActivatedTick(final int activatedTick) {
 	}
 
 	@Override
-	public void onServerTick() {
+	public void onServerTick(final ServerLevel level, final LoadedServerShip ship) {
 		if (this.activatedTick == 0) {
-			this.checkActivate();
+			this.checkActivate(level, ship);
 			return;
 		}
 		if (this.activatedTick > Config.ammoMaxActivateSeconds * 20) {
 			if (!this.deactivated) {
 				this.deactivated = true;
-				this.deactivate();
+				this.deactivate(level, ship);
 			}
 			return;
 		}
@@ -98,41 +76,24 @@ public void managerTick() {
 		this.unmanaged = false;
 	}
 
-	private ServerShip getShip() {
-		final ServerShip ship = this.world.getLoadedShips().getById(this.shipId);
-		if (ship != null) {
-			return ship;
-		}
-		return this.world.getAllShips().getById(this.shipId);
-	}
-
-	private void checkActivate() {
+	private void checkActivate(final ServerLevel level, final LoadedServerShip ship) {
 		if (this.unmanaged) {
-			this.activate();
+			this.activate(level, ship);
 			return;
 		}
 		this.unmanaged = true;
 	}
 
-	private void activate() {
+	private void activate(final ServerLevel level, final LoadedServerShip ship) {
 		this.activatedTick = 1;
-		VSCApi.forceLoad(this.server, this.shipId, AMMO_SHIP_TICKET, true);
+		VSCApi.forceLoad(level.getServer(), ship.getId(), AMMO_SHIP_TICKET, true);
 	}
 
-	private void deactivate() {
-		VSCApi.forceLoad(this.server, this.shipId, AMMO_SHIP_TICKET, false);
+	private void deactivate(final ServerLevel level, final LoadedServerShip ship) {
+		VSCApi.forceLoad(level.getServer(), ship.getId(), AMMO_SHIP_TICKET, false);
 		if (!Config.removeAmmoAfterExpired) {
 			return;
 		}
-		final ServerShip ship = this.getShip();
-		if (ship == null) {
-			return;
-		}
-		final ServerLevel level = LevelUtil.getLevel(ship.getChunkClaimDimension());
-		if (level == null) {
-			this.world.deleteShip(ship);
-			return;
-		}
 		TaskUtil.queueTickStart(() -> ShipAllocator.get(level.getServer()).putShip(ship));
 	}
 }