Rename subproject to fabric-1.21.9-10

fabric-1.21.9-10/build.gradle

@@ -8,7 +8,7 @@ group = parent.group
 
 eclipse {
     project {
-        name = "Dynmap(Fabric-1.21.9)"
+        name = "Dynmap(Fabric-1.21.9-10)"
     }
 }
 
@@ -64,7 +64,7 @@ jar {
 }
 
 remapJar {
-    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}-10.jar" // TODO: Remove -10 when updating after 1.21.10 release
     destinationDirectory = file '../target'
 }
 

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/DynmapMod.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/DynmapPlugin.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -35,16 +35,16 @@ import org.dynmap.common.DynmapCommandSender;
 import org.dynmap.common.DynmapListenerManager;
 import org.dynmap.common.DynmapPlayer;
 import org.dynmap.common.chunk.GenericChunkCache;
-import org.dynmap.fabric_1_21_9.command.DmapCommand;
-import org.dynmap.fabric_1_21_9.command.DmarkerCommand;
-import org.dynmap.fabric_1_21_9.command.DynmapCommand;
-import org.dynmap.fabric_1_21_9.command.DynmapExpCommand;
-import org.dynmap.fabric_1_21_9.event.BlockEvents;
-import org.dynmap.fabric_1_21_9.event.CustomServerChunkEvents;
-import org.dynmap.fabric_1_21_9.event.CustomServerLifecycleEvents;
-import org.dynmap.fabric_1_21_9.event.PlayerEvents;
-import org.dynmap.fabric_1_21_9.mixin.BiomeEffectsAccessor;
-import org.dynmap.fabric_1_21_9.permissions.*;
+import org.dynmap.fabric_1_21_9_10.command.DmapCommand;
+import org.dynmap.fabric_1_21_9_10.command.DmarkerCommand;
+import org.dynmap.fabric_1_21_9_10.command.DynmapCommand;
+import org.dynmap.fabric_1_21_9_10.command.DynmapExpCommand;
+import org.dynmap.fabric_1_21_9_10.event.BlockEvents;
+import org.dynmap.fabric_1_21_9_10.event.CustomServerChunkEvents;
+import org.dynmap.fabric_1_21_9_10.event.CustomServerLifecycleEvents;
+import org.dynmap.fabric_1_21_9_10.event.PlayerEvents;
+import org.dynmap.fabric_1_21_9_10.mixin.BiomeEffectsAccessor;
+import org.dynmap.fabric_1_21_9_10.permissions.*;
 import org.dynmap.permissions.PermissionsHandler;
 import org.dynmap.renderer.DynmapBlockState;
 

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricAdapter.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.minecraft.server.world.ServerWorld;
 import org.dynmap.DynmapLocation;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricCommandSender.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricLogger.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricMapChunkCache.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.minecraft.nbt.*;
 import net.minecraft.server.world.ServerChunkLoadingManager;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricPlayer.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import com.google.common.collect.Iterables;
 import com.google.gson.Gson;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricServer.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
@@ -28,8 +28,8 @@ import org.dynmap.common.BiomeMap;
 import org.dynmap.common.DynmapListenerManager;
 import org.dynmap.common.DynmapPlayer;
 import org.dynmap.common.DynmapServerInterface;
-import org.dynmap.fabric_1_21_9.event.BlockEvents;
-import org.dynmap.fabric_1_21_9.event.ServerChatEvents;
+import org.dynmap.fabric_1_21_9_10.event.BlockEvents;
+import org.dynmap.fabric_1_21_9_10.event.ServerChatEvents;
 import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.VisibilityLimit;
 

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/FabricWorld.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.math.BlockPos;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/NBT.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import org.dynmap.common.chunk.GenericBitStorage;
 import org.dynmap.common.chunk.GenericNBTCompound;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/TaskRecord.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import java.util.concurrent.FutureTask;
 

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/VersionCheck.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9;
+package org.dynmap.fabric_1_21_9_10;
 
 import org.dynmap.DynmapCore;
 import org.dynmap.Log;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/access/ProtoChunkAccessor.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.access;
+package org.dynmap.fabric_1_21_9_10.access;
 
 public interface ProtoChunkAccessor {
     boolean getTouchedByWorldGen();

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/command/DmapCommand.java

@@ -1,6 +1,6 @@
-package org.dynmap.fabric_1_21_9.command;
+package org.dynmap.fabric_1_21_9_10.command;
 
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 public class DmapCommand extends DynmapCommandExecutor {
     public DmapCommand(DynmapPlugin p) {

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/command/DmarkerCommand.java

@@ -1,6 +1,6 @@
-package org.dynmap.fabric_1_21_9.command;
+package org.dynmap.fabric_1_21_9_10.command;
 
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 public class DmarkerCommand extends DynmapCommandExecutor {
     public DmarkerCommand(DynmapPlugin p) {

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/command/DynmapCommand.java

@@ -1,6 +1,6 @@
-package org.dynmap.fabric_1_21_9.command;
+package org.dynmap.fabric_1_21_9_10.command;
 
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 public class DynmapCommand extends DynmapCommandExecutor {
     public DynmapCommand(DynmapPlugin p) {

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/command/DynmapCommandExecutor.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.command;
+package org.dynmap.fabric_1_21_9_10.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
@@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource;
 
 import java.util.Arrays;
 
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 import static com.mojang.brigadier.arguments.StringArgumentType.greedyString;
 import static net.minecraft.server.command.CommandManager.argument;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/command/DynmapExpCommand.java

@@ -1,6 +1,6 @@
-package org.dynmap.fabric_1_21_9.command;
+package org.dynmap.fabric_1_21_9_10.command;
 
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 public class DynmapExpCommand extends DynmapCommandExecutor {
     public DynmapExpCommand(DynmapPlugin p) {

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/event/BlockEvents.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.event;
+package org.dynmap.fabric_1_21_9_10.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/event/CustomServerChunkEvents.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.event;
+package org.dynmap.fabric_1_21_9_10.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/event/CustomServerLifecycleEvents.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.event;
+package org.dynmap.fabric_1_21_9_10.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/event/PlayerEvents.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.event;
+package org.dynmap.fabric_1_21_9_10.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/event/ServerChatEvents.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.event;
+package org.dynmap.fabric_1_21_9_10.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/BiomeEffectsAccessor.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.world.biome.BiomeEffects;
 import org.spongepowered.asm.mixin.Mixin;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/ChunkGeneratingMixin.java

@@ -1,12 +1,12 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.world.chunk.ChunkGenerating;
 import net.minecraft.world.chunk.ChunkGenerationContext;
 import net.minecraft.world.chunk.AbstractChunkHolder;
 import net.minecraft.world.chunk.Chunk;
 
-import org.dynmap.fabric_1_21_9.access.ProtoChunkAccessor;
-import org.dynmap.fabric_1_21_9.event.CustomServerChunkEvents;
+import org.dynmap.fabric_1_21_9_10.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_21_9_10.event.CustomServerChunkEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/MinecraftServerMixin.java

@@ -1,8 +1,8 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.server.MinecraftServer;
 
-import org.dynmap.fabric_1_21_9.event.CustomServerLifecycleEvents;
+import org.dynmap.fabric_1_21_9_10.event.CustomServerLifecycleEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/PlayerManagerMixin.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.network.ClientConnection;
@@ -6,7 +6,7 @@ import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-import org.dynmap.fabric_1_21_9.event.PlayerEvents;
+import org.dynmap.fabric_1_21_9_10.event.PlayerEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/ProtoChunkMixin.java

@@ -1,10 +1,10 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.ProtoChunk;
 
-import org.dynmap.fabric_1_21_9.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_21_9_10.access.ProtoChunkAccessor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/ServerPlayNetworkHandlerMixin.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
@@ -17,8 +17,8 @@ import net.minecraft.util.math.BlockPos;
 import java.util.Arrays;
 import java.util.List;
 
-import org.dynmap.fabric_1_21_9.event.BlockEvents;
-import org.dynmap.fabric_1_21_9.event.ServerChatEvents;
+import org.dynmap.fabric_1_21_9_10.event.BlockEvents;
+import org.dynmap.fabric_1_21_9_10.event.ServerChatEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/ServerPlayerEntityMixin.java

@@ -1,11 +1,11 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.TeleportTarget;
 
-import org.dynmap.fabric_1_21_9.event.PlayerEvents;
+import org.dynmap.fabric_1_21_9_10.event.PlayerEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/mixin/WorldChunkMixin.java

@@ -1,11 +1,11 @@
-package org.dynmap.fabric_1_21_9.mixin;
+package org.dynmap.fabric_1_21_9_10.mixin;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.WorldChunk;
 
-import org.dynmap.fabric_1_21_9.event.BlockEvents;
+import org.dynmap.fabric_1_21_9_10.event.BlockEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/permissions/FabricPermissions.java

@@ -1,9 +1,9 @@
-package org.dynmap.fabric_1_21_9.permissions;
+package org.dynmap.fabric_1_21_9_10.permissions;
 
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.entity.player.PlayerEntity;
 import org.dynmap.Log;
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 import org.dynmap.json.simple.parser.JSONParser;
 
 import java.util.Set;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/permissions/FilePermissions.java

@@ -1,9 +1,9 @@
-package org.dynmap.fabric_1_21_9.permissions;
+package org.dynmap.fabric_1_21_9_10.permissions;
 
 import net.minecraft.entity.player.PlayerEntity;
 import org.dynmap.ConfigurationNode;
 import org.dynmap.Log;
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 import java.io.File;
 import java.util.HashMap;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/permissions/LuckPermissions.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.permissions;
+package org.dynmap.fabric_1_21_9_10.permissions;
 
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.luckperms.api.LuckPerms;
@@ -9,7 +9,7 @@ import net.luckperms.api.util.Tristate;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import org.dynmap.Log;
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 import org.dynmap.json.simple.JSONArray;
 import org.dynmap.json.simple.JSONObject;
 import org.dynmap.json.simple.parser.JSONParser;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/permissions/OpPermissions.java

@@ -1,8 +1,8 @@
-package org.dynmap.fabric_1_21_9.permissions;
+package org.dynmap.fabric_1_21_9_10.permissions;
 
 import net.minecraft.entity.player.PlayerEntity;
 import org.dynmap.Log;
-import org.dynmap.fabric_1_21_9.DynmapPlugin;
+import org.dynmap.fabric_1_21_9_10.DynmapPlugin;
 
 import java.util.HashSet;
 import java.util.Set;

fabric-1.21.9-10/src/main/java/org/dynmap/fabric_1_21_9_10/permissions/PermissionProvider.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21_9.permissions;
+package org.dynmap.fabric_1_21_9_10.permissions;
 
 import net.minecraft.entity.player.PlayerEntity;
 

fabric-1.21.9-10/src/main/resources/dynmap.mixins.json

@@ -1,8 +1,8 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "org.dynmap.fabric_1_21_9.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "package": "org.dynmap.fabric_1_21_9_10.mixin",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "BiomeEffectsAccessor",
     "ChunkGeneratingMixin",

fabric-1.21.9-10/src/main/resources/fabric.mod.json

@@ -18,7 +18,7 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "org.dynmap.fabric_1_21_9.DynmapMod"
+      "org.dynmap.fabric_1_21_9_10.DynmapMod"
     ]
   },
   "mixins": [
@@ -29,6 +29,6 @@
   "depends": {
     "fabricloader": ">=0.17.2",
     "fabric": ">=0.108.0",
-    "minecraft": ["1.21.9"]
+    "minecraft": ["1.21.9", "1.21.10"]
   }
 }

fabric-1.21.9/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+