update vs to 2.4.11

Author: zyxkad

.gitignore

@@ -4,10 +4,11 @@
 # eclipse
 bin
 *.launch
-.settings
-.metadata
 .classpath
+.factorypath
+.metadata
 .project
+.settings
 
 # idea
 out

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

@@ -313,6 +313,8 @@ processResources {
 			'description' : project.description,
 			'github_repo' : github_repo,
 
+			'vs2_version_max' : vs2_version_max,
+			'vs2_version_min' : vs2_version_min,
 			'vtil_version' : vtil_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 = "2.0.1";
+	public static final String MOD_VERSION = "2.0.2";
 	public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME);
 
 	private Constants() {}

common/src/main/java/com/github/litermc/vschunkloader/command/VSCCommands.java

@@ -4,7 +4,6 @@
 import com.github.litermc.vschunkloader.VSCApi;
 
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.CommandSourceStack;
@@ -13,11 +12,9 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
 
-import org.valkyrienskies.core.api.ships.ServerShip;
 import org.valkyrienskies.core.api.ships.Ship;
-import org.valkyrienskies.mod.common.command.ShipArgument;
+import org.valkyrienskies.mod.common.command.arguments.ShipArgument;
 
 import java.util.Set;
 

common/src/main/java/com/github/litermc/vschunkloader/mixin/MixinChunkMap.java

@@ -4,9 +4,6 @@
 import com.github.litermc.vschunkloader.util.ChunkSensor;
 
 import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerLevel;
-
-import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;

common/src/main/java/com/github/litermc/vschunkloader/mixin/MixinShipObjectServerWorld.java

@@ -52,14 +52,14 @@
 import java.util.TreeSet;
 import java.util.function.Predicate;
 
-@Mixin(org.valkyrienskies.core.impl.shadow.Er.class)
+@Mixin(org.valkyrienskies.core.impl.shadow.Et.class)
 public abstract class MixinShipObjectServerWorld implements VsiServerShipWorld {
 	@Unique
-	private static final String M_clearNewUpdatedDeletedShipObjectsAndVoxelUpdates = "j";
+	private static final String M_clearNewUpdatedDeletedShipObjectsAndVoxelUpdates = "k";
 
 	@Shadow(remap = false)
 	@Final
-	private ArrayList<org.valkyrienskies.core.impl.shadow.Er.b> j;
+	private ArrayList<org.valkyrienskies.core.impl.shadow.Et.b> k;
 	@Unique
 	private final Set<VsiPlayer> disconnectedPlayers = new HashSet<>();
 	@Unique
@@ -70,8 +70,8 @@ public abstract class MixinShipObjectServerWorld implements VsiServerShipWorld {
 	private final Map<ChunkPos, AdvancedBitSet> loadedChunks = new HashMap<>();
 
 	@Unique
-	public ArrayList<org.valkyrienskies.core.impl.shadow.Er.b> getVoxelShapeUpdatesList() {
-		return this.j;
+	public ArrayList<org.valkyrienskies.core.impl.shadow.Et.b> getVoxelShapeUpdatesList() {
+		return this.k;
 	}
 
 	@ModifyVariable(method = "setPlayers", at = @At("HEAD"), remap = false)
@@ -163,21 +163,21 @@ public void getChunkWatchTasks(final CallbackInfoReturnable<VsiChunkWatchTasks>
 
 	@Inject(method = M_clearNewUpdatedDeletedShipObjectsAndVoxelUpdates + "()V", at = @At("HEAD"), remap = false)
 	public void clearNewUpdatedDeletedShipObjectsAndVoxelUpdates(final CallbackInfo ci) {
-		for (final org.valkyrienskies.core.impl.shadow.Er.b updates : this.getVoxelShapeUpdatesList()) {
+		for (final org.valkyrienskies.core.impl.shadow.Et.b updates : this.getVoxelShapeUpdatesList()) {
 			final ServerLevel level = LevelUtil.getLevel(updates.a());
 			if (level == null) {
 				continue;
 			}
 			final ChunkSensor sensor = ChunkSensor.get(level);
 			final int maxSectionCount = level.getSectionsCount();
-			for (final org.valkyrienskies.core.impl.shadow.Il update : updates.b()) {
+			for (final org.valkyrienskies.core.impl.shadow.Ip update : updates.b()) {
 				final int x = update.a(), z = update.c();
 				if (VSGameUtilsKt.isChunkInShipyard(level, x, z)) {
 					continue;
 				}
 				final int y = level.getSectionIndexFromSectionY(update.b());
 				final ChunkPos pos = new ChunkPos(x, z);
-				final boolean isload = update.d() != org.valkyrienskies.core.impl.shadow.Ip.DELETE;
+				final boolean isload = update.d() != org.valkyrienskies.core.impl.shadow.It.DELETE;
 				if (isload) {
 					final AdvancedBitSet sections = this.loadedChunks.computeIfAbsent(pos, (pos0) -> new AdvancedBitSet(maxSectionCount));
 					if (sections.set(y) && sections.count() == maxSectionCount) {

common/src/main/java/com/github/litermc/vschunkloader/mixin/client/MixinClientChunkCache.java

@@ -13,7 +13,6 @@
 		"MixinSleepStatus"
 	],
 	"client": [
-		"client.MixinClientChunkCache",
 		"client.MixinLevelRenderer"
 	],
 	"server": [

common/src/main/resources/vschunkloader.mixins.json

@@ -32,7 +32,7 @@
 		"fabricloader": ">=0.16",
 		"java": ">=17",
 		"minecraft": "${minecraft_version}",
-		"valkyrienskies": "2.4.*"
+		"valkyrienskies": ">=${vs2_version_min} <${vs2_version_max}"
 	}
 }
 

fabric/src/main/resources/fabric.mod.json

@@ -30,6 +30,6 @@ side = "BOTH"
 [[dependencies.${mod_id}]]
 modId = "valkyrienskies"
 mandatory = true
-versionRange = "[2.4,2.5)"
+versionRange = "[${vs2_version_min},${vs2_version_max})"
 ordering = "AFTER"
 side = "BOTH"