diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapMod.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapMod.java index 03adb9fe..2ae5abd5 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapMod.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java index ddfe24a0..6657cc76 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; 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_19_4.command.DmapCommand; -import org.dynmap.fabric_1_19_4.command.DmarkerCommand; -import org.dynmap.fabric_1_19_4.command.DynmapCommand; -import org.dynmap.fabric_1_19_4.command.DynmapExpCommand; -import org.dynmap.fabric_1_19_4.event.BlockEvents; -import org.dynmap.fabric_1_19_4.event.CustomServerChunkEvents; -import org.dynmap.fabric_1_19_4.event.CustomServerLifecycleEvents; -import org.dynmap.fabric_1_19_4.event.PlayerEvents; -import org.dynmap.fabric_1_19_4.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_19_4.permissions.*; +import org.dynmap.fabric_1_20.command.DmapCommand; +import org.dynmap.fabric_1_20.command.DmarkerCommand; +import org.dynmap.fabric_1_20.command.DynmapCommand; +import org.dynmap.fabric_1_20.command.DynmapExpCommand; +import org.dynmap.fabric_1_20.event.BlockEvents; +import org.dynmap.fabric_1_20.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20.event.PlayerEvents; +import org.dynmap.fabric_1_20.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_20.permissions.*; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricAdapter.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricAdapter.java index eca1267f..8258e1a9 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricAdapter.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricAdapter.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import net.minecraft.server.world.ServerWorld; import org.dynmap.DynmapLocation; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricCommandSender.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricCommandSender.java index 0e5a4c95..87765c75 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricCommandSender.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricCommandSender.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralTextContent; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricLogger.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricLogger.java index 076e9794..b62bca8a 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricLogger.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricLogger.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricMapChunkCache.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricMapChunkCache.java index d089b32e..3814bf0f 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricMapChunkCache.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import net.minecraft.nbt.*; import net.minecraft.server.world.ServerChunkManager; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java index 819661f2..14e1b0b1 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import com.google.common.collect.Iterables; import com.google.gson.Gson; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricServer.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricServer.java index ba22c52d..fbdd8956 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricServer.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricServer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import com.mojang.authlib.GameProfile; import net.fabricmc.loader.api.FabricLoader; @@ -29,8 +29,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_19_4.event.BlockEvents; -import org.dynmap.fabric_1_19_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20.event.BlockEvents; +import org.dynmap.fabric_1_20.event.ServerChatEvents; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.VisibilityLimit; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java index a0b6d5f6..e77798a3 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import net.minecraft.registry.RegistryKey; import net.minecraft.util.math.BlockPos; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/NBT.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/NBT.java index c08364ac..55d26213 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/NBT.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/NBT.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import org.dynmap.common.chunk.GenericBitStorage; import org.dynmap.common.chunk.GenericNBTCompound; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/TaskRecord.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/TaskRecord.java index 378c37f6..a9a6a1b3 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/TaskRecord.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/TaskRecord.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import java.util.concurrent.FutureTask; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/VersionCheck.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/VersionCheck.java index b4551f0d..1cc063e6 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/VersionCheck.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4; +package org.dynmap.fabric_1_20; import org.dynmap.DynmapCore; import org.dynmap.Log; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/access/ProtoChunkAccessor.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/access/ProtoChunkAccessor.java index 7bd43c51..016748e7 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/access/ProtoChunkAccessor.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/access/ProtoChunkAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.access; +package org.dynmap.fabric_1_20.access; public interface ProtoChunkAccessor { boolean getTouchedByWorldGen(); diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmapCommand.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmapCommand.java index 9979a250..271c1231 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmapCommand.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_19_4.command; +package org.dynmap.fabric_1_20.command; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; public class DmapCommand extends DynmapCommandExecutor { public DmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmarkerCommand.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmarkerCommand.java index 36f5451a..08c2a56b 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmarkerCommand.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmarkerCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_19_4.command; +package org.dynmap.fabric_1_20.command; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; public class DmarkerCommand extends DynmapCommandExecutor { public DmarkerCommand(DynmapPlugin p) { diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommand.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommand.java index 78115bba..cf0a4536 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommand.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_19_4.command; +package org.dynmap.fabric_1_20.command; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; public class DynmapCommand extends DynmapCommandExecutor { public DynmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommandExecutor.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommandExecutor.java index 7bd98b34..f6a95701 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommandExecutor.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommandExecutor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.command; +package org.dynmap.fabric_1_20.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; @@ -8,7 +8,7 @@ import com.mojang.brigadier.tree.ArgumentCommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; import com.mojang.brigadier.tree.RootCommandNode; import net.minecraft.server.command.ServerCommandSource; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; import java.util.Arrays; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapExpCommand.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapExpCommand.java index 0b9b252a..7956a4c1 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapExpCommand.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapExpCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_19_4.command; +package org.dynmap.fabric_1_20.command; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; public class DynmapExpCommand extends DynmapCommandExecutor { public DynmapExpCommand(DynmapPlugin p) { diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/BlockEvents.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/BlockEvents.java index 23f89b53..e2ed62dd 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/BlockEvents.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/BlockEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.event; +package org.dynmap.fabric_1_20.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerChunkEvents.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerChunkEvents.java index e27b4cff..e54a3f0e 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerChunkEvents.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerChunkEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.event; +package org.dynmap.fabric_1_20.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerLifecycleEvents.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerLifecycleEvents.java index ae501bb7..1ab0928a 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerLifecycleEvents.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerLifecycleEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.event; +package org.dynmap.fabric_1_20.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/PlayerEvents.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/PlayerEvents.java index c17ebf08..b2631122 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/PlayerEvents.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/PlayerEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.event; +package org.dynmap.fabric_1_20.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/ServerChatEvents.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/ServerChatEvents.java index b6a9a291..1e2f9e48 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/ServerChatEvents.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/ServerChatEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.event; +package org.dynmap.fabric_1_20.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/BiomeEffectsAccessor.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/BiomeEffectsAccessor.java index 7e932f00..4e4d2828 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/BiomeEffectsAccessor.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/BiomeEffectsAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.world.biome.BiomeEffects; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/MinecraftServerMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/MinecraftServerMixin.java index 62a778d7..54e9643f 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/MinecraftServerMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/MinecraftServerMixin.java @@ -1,7 +1,7 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.server.MinecraftServer; -import org.dynmap.fabric_1_19_4.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/mixin/PlayerManagerMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/PlayerManagerMixin.java index d5d3379f..0e939464 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/PlayerManagerMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/PlayerManagerMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; -import org.dynmap.fabric_1_19_4.event.PlayerEvents; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/mixin/ProtoChunkMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ProtoChunkMixin.java index ebb76f3f..e2bf9f8c 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ProtoChunkMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ProtoChunkMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.ProtoChunk; -import org.dynmap.fabric_1_19_4.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayNetworkHandlerMixin.java index c8f84260..0ef2fe5f 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -15,8 +15,8 @@ import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import java.util.List; -import org.dynmap.fabric_1_19_4.event.BlockEvents; -import org.dynmap.fabric_1_19_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20.event.BlockEvents; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayerEntityMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayerEntityMixin.java index 45220c92..41892ea0 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayerEntityMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayerEntityMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.entity.Entity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import org.dynmap.fabric_1_19_4.event.PlayerEvents; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ThreadedAnvilChunkStorageMixin.java index 53d3fe23..7284ffa8 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ThreadedAnvilChunkStorageMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ThreadedAnvilChunkStorageMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.mixin; import net.minecraft.server.world.ChunkHolder; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; import net.minecraft.world.chunk.Chunk; -import org.dynmap.fabric_1_19_4.access.ProtoChunkAccessor; -import org.dynmap.fabric_1_19_4.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20.event.CustomServerChunkEvents; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/WorldChunkMixin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/WorldChunkMixin.java index d4fa7996..acc9fabb 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/WorldChunkMixin.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/WorldChunkMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_19_4.mixin; +package org.dynmap.fabric_1_20.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_19_4.event.BlockEvents; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/permissions/FabricPermissions.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FabricPermissions.java index 81987855..a3afac28 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FabricPermissions.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FabricPermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_19_4.permissions; +package org.dynmap.fabric_1_20.permissions; import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; import org.dynmap.json.simple.parser.JSONParser; import java.util.Set; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FilePermissions.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FilePermissions.java index 92a8eb09..42c4beb6 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FilePermissions.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FilePermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_19_4.permissions; +package org.dynmap.fabric_1_20.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; import java.io.File; import java.util.HashMap; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/LuckPermissions.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/LuckPermissions.java index 068ea12d..a1cd1128 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/LuckPermissions.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/LuckPermissions.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.permissions; +package org.dynmap.fabric_1_20.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_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.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.20/src/main/java/org/dynmap/fabric_1_20/permissions/OpPermissions.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/OpPermissions.java index fcd0d812..68e31af3 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/OpPermissions.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/OpPermissions.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_19_4.permissions; +package org.dynmap.fabric_1_20.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_19_4.DynmapPlugin; +import org.dynmap.fabric_1_20.DynmapPlugin; import java.util.HashSet; import java.util.Set; diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/PermissionProvider.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/PermissionProvider.java index 3679f4a0..c61a3d80 100644 --- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/PermissionProvider.java +++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_19_4.permissions; +package org.dynmap.fabric_1_20.permissions; import net.minecraft.entity.player.PlayerEntity; diff --git a/fabric-1.20/src/main/resources/dynmap.mixins.json b/fabric-1.20/src/main/resources/dynmap.mixins.json index b9f3f9e2..fba5f60b 100644 --- a/fabric-1.20/src/main/resources/dynmap.mixins.json +++ b/fabric-1.20/src/main/resources/dynmap.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.dynmap.fabric_1_19_4.mixin", + "package": "org.dynmap.fabric_1_20.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "BiomeEffectsAccessor", diff --git a/fabric-1.20/src/main/resources/fabric.mod.json b/fabric-1.20/src/main/resources/fabric.mod.json index fd75fed3..390f6e80 100644 --- a/fabric-1.20/src/main/resources/fabric.mod.json +++ b/fabric-1.20/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "org.dynmap.fabric_1_19_4.DynmapMod" + "org.dynmap.fabric_1_20.DynmapMod" ] }, "mixins": [