update vtil to 0.6.0

zyxkad · zyxkad · commit 92417d81298c · 2026-01-31T08:34:24.000-07:00
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/VSCApi.java b/common/src/main/java/com/github/litermc/vschunkloader/VSCApi.java
@@ -1,7 +1,7 @@
 package com.github.litermc.vschunkloader;
 
 import com.github.litermc.vschunkloader.attachment.AmmoShipAttachment;
-import com.github.litermc.vschunkloader.attachment.ForceLoadAttachment;
+import com.github.litermc.vschunkloader.attachment.ForceLoadStorage;
 import com.github.litermc.vschunkloader.config.Config;
 
 import net.minecraft.resources.ResourceLocation;
@@ -45,7 +45,7 @@ public static boolean forceLoad(final MinecraftServer server, final long id, fin
 		if (ship == null) {
 			return false;
 		}
-		final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);
+		final ForceLoadStorage attachment = ForceLoadStorage.get(ship);
 		if (load) {
 			attachment.addForceLoad(token);
 		} else {
@@ -68,7 +68,7 @@ public static boolean clearForceLoadTokens(final MinecraftServer server, final l
 		if (ship == null) {
 			return false;
 		}
-		final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);
+		final ForceLoadStorage attachment = ForceLoadStorage.get(ship);
 		attachment.removeAllForceLoadTokens();
 		return true;
 	}
@@ -86,7 +86,7 @@ public static Set<ResourceLocation> getForceLoadTokens(final MinecraftServer ser
 		if (ship == null) {
 			return null;
 		}
-		final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);
+		final ForceLoadStorage attachment = ForceLoadStorage.get(ship);
 		return attachment.getAllForceLoadTokens();
 	}
 
@@ -102,7 +102,7 @@ public static boolean isForceLoaded(final MinecraftServer server, final long id)
 		if (ship == null) {
 			return false;
 		}
-		return ForceLoadAttachment.get(ship).isForceLoaded();
+		return ForceLoadStorage.get(ship).isForceLoaded();
 	}
 
 	/**
@@ -118,7 +118,7 @@ public static boolean isForceLoadedBy(final MinecraftServer server, final long i
 		if (ship == null) {
 			return false;
 		}
-		return ForceLoadAttachment.get(ship).isForceLoadedBy(token);
+		return ForceLoadStorage.get(ship).isForceLoadedBy(token);
 	}
 
 	private static ServerShip getShip(final MinecraftServer server, final long id) {
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/VSCListeners.java b/common/src/main/java/com/github/litermc/vschunkloader/VSCListeners.java
@@ -1,7 +1,6 @@
 package com.github.litermc.vschunkloader;
 
 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;
@@ -33,7 +32,6 @@ public static void onModSetup() {
 
 	private static void registerAttachments() {
 		ValkyrienSkiesMod.getApi().registerAttachment(AmmoShipAttachment.class);
-		ValkyrienSkiesMod.getApi().registerAttachment(ForceLoadAttachment.class);
 	}
 
 	public static void onServerLevelLoad(final ServerLevel level) {
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/attachment/ForceLoadAttachment.java b/common/src/main/java/com/github/litermc/vschunkloader/attachment/ForceLoadAttachment.java
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/attachment/ForceLoadStorage.java b/common/src/main/java/com/github/litermc/vschunkloader/attachment/ForceLoadStorage.java
@@ -0,0 +1,75 @@
+package com.github.litermc.vschunkloader.attachment;
+
+import com.github.litermc.vschunkloader.platform.PlatformHelper;
+import com.github.litermc.vtil.api.storage.IShipAdditionalData;
+import com.github.litermc.vtil.api.storage.ShipDataStorage;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.ResourceLocation;
+
+import org.valkyrienskies.core.api.ships.LoadedServerShip;
+import org.valkyrienskies.core.api.ships.ServerShip;
+import org.valkyrienskies.core.impl.game.ships.ShipData;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public final class ForceLoadStorage implements IShipAdditionalData {
+	private Set<ResourceLocation> forceLoadTokens = new HashSet<>();
+
+	public ForceLoadStorage() {}
+
+	public static ForceLoadStorage get(final ServerShip ship) {
+		return ShipDataStorage.get(ship).getOrCreate(ForceLoadStorage.class);
+	}
+
+	@Override
+	public void load(final CompoundTag data) {
+		data.getList("forceLoadTokens", Tag.TAG_STRING)
+			.forEach((tag) -> this.forceLoadTokens.add(new ResourceLocation(tag.getAsString())));
+	}
+
+	@Override
+	public void save(final CompoundTag data) {
+		final ListTag forceLoadTokens = new ListTag();
+		for (final ResourceLocation token : this.forceLoadTokens) {
+			forceLoadTokens.add(StringTag.valueOf(token.toString()));
+		}
+		data.put("forceLoadTokens", forceLoadTokens);
+	}
+
+	public boolean isForceLoaded() {
+		final PlatformHelper platform = PlatformHelper.get();
+		for (final ResourceLocation id : this.forceLoadTokens) {
+			if (platform.isModLoaded(id.getNamespace())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean isForceLoadedBy(final ResourceLocation token) {
+		return this.forceLoadTokens.contains(token);
+	}
+
+	public void addForceLoad(final ResourceLocation token) {
+		this.forceLoadTokens.add(token);
+	}
+
+	public void removeForceLoad(final ResourceLocation token) {
+		this.forceLoadTokens.remove(token);
+	}
+
+	public void removeAllForceLoadTokens() {
+		this.forceLoadTokens.clear();
+	}
+
+	public Set<ResourceLocation> getAllForceLoadTokens() {
+		return Collections.unmodifiableSet(this.forceLoadTokens);
+	}
+}
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/mixin/MixinShipObjectServerWorld.java b/common/src/main/java/com/github/litermc/vschunkloader/mixin/MixinShipObjectServerWorld.java
@@ -87,6 +87,9 @@ public ArrayList<org.valkyrienskies.core.impl.shadow.Er.b> getVoxelShapeUpdatesL
 
 	@Inject(method = "onDisconnect", at = @At("RETURN"), remap = false)
 	public void onDisconnect(final VsiPlayer player, final CallbackInfo ci) {
+		if (!(((Object) (player)) instanceof VsiPlayer)) {
+			throw new RuntimeException("VsiPlayer verify failed on " + player);
+		}
 		this.disconnectedPlayers.add(player);
 	}
 
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -31,5 +31,5 @@ side = "BOTH"
 modId = "valkyrienskies"
 mandatory = true
 versionRange = "[2.4,2.5)"
-ordering = "BEFORE"
+ordering = "AFTER"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -37,7 +37,7 @@ cloth_config_version=6.4.90
 kff_version=4.10.0
 vs2_version=2.4.5
 vs_core_version=1.1.0+3d898dfd55
-vtil_version=0.5.9
+vtil_version=0.6.0
 
 # Soft dependencies
 jade_version=11.13.1

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.github.litermc.vschunkloader;`
`2`	`2`
`3`	`3`	`import com.github.litermc.vschunkloader.attachment.AmmoShipAttachment;`
`4`		`-import com.github.litermc.vschunkloader.attachment.ForceLoadAttachment;`
	`4`	`+import com.github.litermc.vschunkloader.attachment.ForceLoadStorage;`
`5`	`5`	`import com.github.litermc.vschunkloader.config.Config;`
`6`	`6`
`7`	`7`	`import net.minecraft.resources.ResourceLocation;`
`@@ -45,7 +45,7 @@ public static boolean forceLoad(final MinecraftServer server, final long id, fin`
`45`	`45`	`if (ship == null) {`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`		`- final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);`
	`48`	`+ final ForceLoadStorage attachment = ForceLoadStorage.get(ship);`
`49`	`49`	`if (load) {`
`50`	`50`	`attachment.addForceLoad(token);`
`51`	`51`	`} else {`
`@@ -68,7 +68,7 @@ public static boolean clearForceLoadTokens(final MinecraftServer server, final l`
`68`	`68`	`if (ship == null) {`
`69`	`69`	`return false;`
`70`	`70`	`}`
`71`		`- final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);`
	`71`	`+ final ForceLoadStorage attachment = ForceLoadStorage.get(ship);`
`72`	`72`	`attachment.removeAllForceLoadTokens();`
`73`	`73`	`return true;`
`74`	`74`	`}`
`@@ -86,7 +86,7 @@ public static Set<ResourceLocation> getForceLoadTokens(final MinecraftServer ser`
`86`	`86`	`if (ship == null) {`
`87`	`87`	`return null;`
`88`	`88`	`}`
`89`		`- final ForceLoadAttachment attachment = ForceLoadAttachment.get(ship);`
	`89`	`+ final ForceLoadStorage attachment = ForceLoadStorage.get(ship);`
`90`	`90`	`return attachment.getAllForceLoadTokens();`
`91`	`91`	`}`
`92`	`92`
`@@ -102,7 +102,7 @@ public static boolean isForceLoaded(final MinecraftServer server, final long id)`
`102`	`102`	`if (ship == null) {`
`103`	`103`	`return false;`
`104`	`104`	`}`
`105`		`- return ForceLoadAttachment.get(ship).isForceLoaded();`
	`105`	`+ return ForceLoadStorage.get(ship).isForceLoaded();`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
`@@ -118,7 +118,7 @@ public static boolean isForceLoadedBy(final MinecraftServer server, final long i`
`118`	`118`	`if (ship == null) {`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`		`- return ForceLoadAttachment.get(ship).isForceLoadedBy(token);`
	`121`	`+ return ForceLoadStorage.get(ship).isForceLoadedBy(token);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private static ServerShip getShip(final MinecraftServer server, final long id) {`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,9 @@ public ArrayList<org.valkyrienskies.core.impl.shadow.Er.b> getVoxelShapeUpdatesL`
`87`	`87`
`88`	`88`	`@Inject(method = "onDisconnect", at = @At("RETURN"), remap = false)`
`89`	`89`	`public void onDisconnect(final VsiPlayer player, final CallbackInfo ci) {`
	`90`	`+ if (!(((Object) (player)) instanceof VsiPlayer)) {`
	`91`	`+ throw new RuntimeException("VsiPlayer verify failed on " + player);`
	`92`	`+ }`
`90`	`93`	`this.disconnectedPlayers.add(player);`
`91`	`94`	`}`
`92`	`95`