From c12f4fdf1823f47829af9764399a4bcc1b04ff39 Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Mon, 6 Jan 2025 14:42:50 -0500 Subject: [PATCH] Fix packages in Fabric 1.21.4 PR... --- .../org/dynmap/fabric_1_21_4/DynmapMod.java | 2 +- .../dynmap/fabric_1_21_4/DynmapPlugin.java | 22 +++++++++---------- .../dynmap/fabric_1_21_4/FabricAdapter.java | 2 +- .../fabric_1_21_4/FabricCommandSender.java | 2 +- .../dynmap/fabric_1_21_4/FabricLogger.java | 2 +- .../fabric_1_21_4/FabricMapChunkCache.java | 2 +- .../dynmap/fabric_1_21_4/FabricPlayer.java | 2 +- .../dynmap/fabric_1_21_4/FabricServer.java | 6 ++--- .../org/dynmap/fabric_1_21_4/FabricWorld.java | 2 +- .../java/org/dynmap/fabric_1_21_4/NBT.java | 2 +- .../org/dynmap/fabric_1_21_4/TaskRecord.java | 2 +- .../dynmap/fabric_1_21_4/VersionCheck.java | 2 +- .../access/ProtoChunkAccessor.java | 2 +- .../fabric_1_21_4/command/DmapCommand.java | 4 ++-- .../fabric_1_21_4/command/DmarkerCommand.java | 4 ++-- .../fabric_1_21_4/command/DynmapCommand.java | 4 ++-- .../command/DynmapCommandExecutor.java | 4 ++-- .../command/DynmapExpCommand.java | 4 ++-- .../fabric_1_21_4/event/BlockEvents.java | 2 +- .../event/CustomServerChunkEvents.java | 2 +- .../event/CustomServerLifecycleEvents.java | 2 +- .../fabric_1_21_4/event/PlayerEvents.java | 2 +- .../fabric_1_21_4/event/ServerChatEvents.java | 2 +- .../mixin/BiomeEffectsAccessor.java | 2 +- .../mixin/ChunkGeneratingMixin.java | 6 ++--- .../mixin/MinecraftServerMixin.java | 4 ++-- .../mixin/PlayerManagerMixin.java | 4 ++-- .../fabric_1_21_4/mixin/ProtoChunkMixin.java | 4 ++-- .../mixin/ServerPlayNetworkHandlerMixin.java | 6 ++--- .../mixin/ServerPlayerEntityMixin.java | 4 ++-- .../fabric_1_21_4/mixin/WorldChunkMixin.java | 4 ++-- .../permissions/FabricPermissions.java | 4 ++-- .../permissions/FilePermissions.java | 4 ++-- .../permissions/LuckPermissions.java | 4 ++-- .../permissions/OpPermissions.java | 4 ++-- .../permissions/PermissionProvider.java | 2 +- 36 files changed, 66 insertions(+), 66 deletions(-) diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapMod.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapMod.java index 8c2e3bef..2cec8111 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapMod.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapPlugin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapPlugin.java index 6ec7e5cb..f36b61ac 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapPlugin.java +++ b/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.DynmapCommandSender; 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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricAdapter.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricAdapter.java index 3560e44d..3ca03378 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricAdapter.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricCommandSender.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricCommandSender.java index 5616d9f6..edf38df9 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricCommandSender.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricLogger.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricLogger.java index f2046938..520a46f9 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricLogger.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricMapChunkCache.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricMapChunkCache.java index 071511e5..ef06f097 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricMapChunkCache.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricPlayer.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricPlayer.java index f026ec67..39b32510 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricPlayer.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricServer.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricServer.java index 4377a5c3..64902fe3 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricServer.java +++ b/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.BiomeMap; 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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricWorld.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricWorld.java index e0ded754..cb606f44 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricWorld.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/NBT.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/NBT.java index 49ad8d91..df02adb7 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/NBT.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/TaskRecord.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/TaskRecord.java index dc5c3295..f5b20879 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/TaskRecord.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/VersionCheck.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/VersionCheck.java index 94a12f7b..0ac1da0b 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/VersionCheck.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/access/ProtoChunkAccessor.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/access/ProtoChunkAccessor.java index fd2ad5fa..ad0a49c7 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/access/ProtoChunkAccessor.java +++ b/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(); diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmapCommand.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmapCommand.java index 8510555e..84848de1 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmapCommand.java +++ b/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) { diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmarkerCommand.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmarkerCommand.java index a6216335..a0b1b767 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmarkerCommand.java +++ b/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) { diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommand.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommand.java index c9180f37..af445a74 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommand.java +++ b/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) { diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommandExecutor.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommandExecutor.java index 702edd8c..b14b6e2a 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommandExecutor.java +++ b/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 net.minecraft.server.command.ServerCommandSource; 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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapExpCommand.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapExpCommand.java index 2fcf9f69..e6a66958 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapExpCommand.java +++ b/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) { diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/BlockEvents.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/BlockEvents.java index 6cc11786..1c5dd78e 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/BlockEvents.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerChunkEvents.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerChunkEvents.java index 1b390c34..914f564a 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerChunkEvents.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerLifecycleEvents.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerLifecycleEvents.java index 46f02804..ca43d951 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerLifecycleEvents.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/PlayerEvents.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/PlayerEvents.java index dad913e0..13e790ad 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/PlayerEvents.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/ServerChatEvents.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/ServerChatEvents.java index c0c3cead..faea3621 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/ServerChatEvents.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/BiomeEffectsAccessor.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/BiomeEffectsAccessor.java index 7bcf881c..ab3869ea 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/BiomeEffectsAccessor.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ChunkGeneratingMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ChunkGeneratingMixin.java index e206a0ad..d88c0118 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ChunkGeneratingMixin.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/MinecraftServerMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/MinecraftServerMixin.java index 2b296eef..2fd97657 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/MinecraftServerMixin.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java index aabd196b..3ef0b18b 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java +++ b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java @@ -1,4 +1,4 @@ -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; @@ -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.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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ProtoChunkMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ProtoChunkMixin.java index d6a22196..ac649def 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ProtoChunkMixin.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayNetworkHandlerMixin.java index a273cfd3..c2181be8 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayNetworkHandlerMixin.java +++ b/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 net.minecraft.util.math.BlockPos; 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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayerEntityMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayerEntityMixin.java index 82fc9b5f..44f7a1ce 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayerEntityMixin.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/WorldChunkMixin.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/WorldChunkMixin.java index af289d7f..6f2f18be 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/WorldChunkMixin.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FabricPermissions.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FabricPermissions.java index 6abd5719..60a91005 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FabricPermissions.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FilePermissions.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FilePermissions.java index 7c2f0fd7..70369489 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FilePermissions.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/LuckPermissions.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/LuckPermissions.java index 8723aa5f..626c2121 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/LuckPermissions.java +++ b/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.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.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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/OpPermissions.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/OpPermissions.java index 44453561..c6510d71 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/OpPermissions.java +++ b/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; diff --git a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/PermissionProvider.java b/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/PermissionProvider.java index 1e08a7fd..36f60fac 100644 --- a/fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/PermissionProvider.java +++ b/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;