Fix packages in Fabric 1.21.4 PR...

Author: mikeprimm-mirific

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapMod.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapPlugin.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricAdapter.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricCommandSender.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricLogger.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricMapChunkCache.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricPlayer.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricServer.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21;
+package org.dynmap.fabric_1_21_4;
 
 import com.mojang.authlib.GameProfile;
 import net.fabricmc.loader.api.FabricLoader;
@@ -28,8 +28,8 @@
 import org.dynmap.common.DynmapListenerManager;
 import org.dynmap.common.DynmapPlayer;
 import org.dynmap.common.DynmapServerInterface;
-import org.dynmap.fabric_1_21.event.BlockEvents;
-import org.dynmap.fabric_1_21.event.ServerChatEvents;
+import org.dynmap.fabric_1_21_4.event.BlockEvents;
+import org.dynmap.fabric_1_21_4.event.ServerChatEvents;
 import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.VisibilityLimit;
 

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricWorld.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/NBT.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/TaskRecord.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/VersionCheck.java

@@ -1,4 +1,4 @@
-package org.dynmap.fabric_1_21;
+package org.dynmap.fabric_1_21_4;
 
 import org.dynmap.DynmapCore;
 import org.dynmap.Log;

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/access/ProtoChunkAccessor.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmapCommand.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmarkerCommand.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommand.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommandExecutor.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapExpCommand.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/BlockEvents.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerChunkEvents.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerLifecycleEvents.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/PlayerEvents.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/ServerChatEvents.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/BiomeEffectsAccessor.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ChunkGeneratingMixin.java

@@ -1,12 +1,12 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.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.access.ProtoChunkAccessor;
-import org.dynmap.fabric_1_21.event.CustomServerChunkEvents;
+import org.dynmap.fabric_1_21_4.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_21_4.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.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/MinecraftServerMixin.java

@@ -1,8 +1,8 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.mixin;
 
 import net.minecraft.server.MinecraftServer;
 
-import org.dynmap.fabric_1_21.event.CustomServerLifecycleEvents;
+import org.dynmap.fabric_1_21_4.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.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java

@@ -1,12 +1,12 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.mixin;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-import org.dynmap.fabric_1_21.event.PlayerEvents;
+import org.dynmap.fabric_1_21_4.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.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ProtoChunkMixin.java

@@ -1,10 +1,10 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.mixin;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.ProtoChunk;
 
-import org.dynmap.fabric_1_21.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_21_4.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.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayNetworkHandlerMixin.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayerEntityMixin.java

@@ -1,11 +1,11 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.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.event.PlayerEvents;
+import org.dynmap.fabric_1_21_4.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.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/WorldChunkMixin.java

@@ -1,11 +1,11 @@
-package org.dynmap.fabric_1_21.mixin;
+package org.dynmap.fabric_1_21_4.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.event.BlockEvents;
+import org.dynmap.fabric_1_21_4.event.BlockEvents;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FabricPermissions.java

@@ -1,9 +1,9 @@
-package org.dynmap.fabric_1_21.permissions;
+package org.dynmap.fabric_1_21_4.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.DynmapPlugin;
+import org.dynmap.fabric_1_21_4.DynmapPlugin;
 import org.dynmap.json.simple.parser.JSONParser;
 
 import java.util.Set;

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FilePermissions.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/LuckPermissions.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/OpPermissions.java

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

fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/PermissionProvider.java

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