diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle index 8e075241..b21c36a3 100644 --- a/fabric-1.20.6/build.gradle +++ b/fabric-1.20.6/build.gradle @@ -8,7 +8,7 @@ group = parent.group eclipse { project { - name = "Dynmap(Fabric-1.20.4)" + name = "Dynmap(Fabric-1.20.6)" } } diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java index dd89f6b6..e8f3ebb2 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java index 438dc017..3f626456 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; 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_20_4.command.DmapCommand; -import org.dynmap.fabric_1_20_4.command.DmarkerCommand; -import org.dynmap.fabric_1_20_4.command.DynmapCommand; -import org.dynmap.fabric_1_20_4.command.DynmapExpCommand; -import org.dynmap.fabric_1_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; -import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; -import org.dynmap.fabric_1_20_4.event.PlayerEvents; -import org.dynmap.fabric_1_20_4.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_20_4.permissions.*; +import org.dynmap.fabric_1_20_6.command.DmapCommand; +import org.dynmap.fabric_1_20_6.command.DmarkerCommand; +import org.dynmap.fabric_1_20_6.command.DynmapCommand; +import org.dynmap.fabric_1_20_6.command.DynmapExpCommand; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20_6.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20_6.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_20_6.permissions.*; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java similarity index 91% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java index ca90c9cf..0e7b0d83 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.server.world.ServerWorld; import org.dynmap.DynmapLocation; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java index 265ab9a3..7a88d409 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java index 680b7d45..2d7c873a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java index 91910b63..c2471730 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.nbt.*; import net.minecraft.server.world.ServerChunkManager; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java index 6755ab7c..19e69653 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import com.google.common.collect.Iterables; import com.google.gson.Gson; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java index 24e525b9..ddada1e6 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; 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_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.ServerChatEvents; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.VisibilityLimit; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java index 132382c7..0093aacd 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.registry.RegistryKey; import net.minecraft.util.math.BlockPos; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java index deaac1d6..51a58e41 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.dynmap.common.chunk.GenericBitStorage; import org.dynmap.common.chunk.GenericNBTCompound; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java index f3f3d7b8..5570150a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import java.util.concurrent.FutureTask; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java index ecbda369..f687f2e4 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.dynmap.DynmapCore; import org.dynmap.Log; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java similarity index 65% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java index 7ef7654e..acb68e5a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.access; +package org.dynmap.fabric_1_20_6.access; public interface ProtoChunkAccessor { boolean getTouchedByWorldGen(); diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java similarity index 60% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java index f2799867..53c6235d 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DmapCommand extends DynmapCommandExecutor { public DmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java similarity index 61% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java index 798e4d0c..859a5799 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DmarkerCommand extends DynmapCommandExecutor { public DmarkerCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java similarity index 61% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java index 0d87c895..f961015b 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DynmapCommand extends DynmapCommandExecutor { public DynmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java index 86bb94b9..783365be 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.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_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; import static net.minecraft.server.command.CommandManager.argument; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java similarity index 62% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java index 81f016bb..389c5873 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DynmapExpCommand extends DynmapCommandExecutor { public DynmapExpCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java similarity index 97% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java index 0ba347b5..cff4c383 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java similarity index 94% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java index 21aa8477..8c845949 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java index b15c1ba7..7356aa38 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java index 1e27cf74..70bcca25 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java similarity index 94% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java index 25d8c5ca..05f47672 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java similarity index 86% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java index 192507b4..3b8d6224 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.world.biome.BiomeEffects; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java similarity index 84% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java index 1c76a8ec..a125b20e 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.server.MinecraftServer; -import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java index 2bb586ad..f45257de 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; 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_20_4.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java similarity index 91% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java index d19d0ab1..b7684a1a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.ProtoChunk; -import org.dynmap.fabric_1_20_4.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java similarity index 95% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java index bc130d1f..ceb4eced 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.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_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java index 6cd4e3ca..0adfe9dd 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.entity.Entity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java similarity index 88% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java index 1675f19d..0adfbb76 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java @@ -1,12 +1,12 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.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_20_4.access.ProtoChunkAccessor; -import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20_6.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java similarity index 90% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java index 71a0f107..3e5b9fb6 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.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_20_4.event.BlockEvents; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java index 11dc5382..42409e1b 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import org.dynmap.json.simple.parser.JSONParser; import java.util.Set; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java index 58374d56..44c015c3 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import java.io.File; import java.util.HashMap; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java similarity index 97% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java index a86c2674..48f93c7e 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.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_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.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.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java index 6d90b10b..d74e2a05 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import java.util.HashSet; import java.util.Set; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java similarity index 89% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java index 68e5169d..d17c0d50 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; diff --git a/fabric-1.20.6/src/main/resources/dynmap.mixins.json b/fabric-1.20.6/src/main/resources/dynmap.mixins.json index 8c2450b7..21f20813 100644 --- a/fabric-1.20.6/src/main/resources/dynmap.mixins.json +++ b/fabric-1.20.6/src/main/resources/dynmap.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.dynmap.fabric_1_20_4.mixin", + "package": "org.dynmap.fabric_1_20_6.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "BiomeEffectsAccessor", diff --git a/fabric-1.20.6/src/main/resources/fabric.mod.json b/fabric-1.20.6/src/main/resources/fabric.mod.json index b9890cef..73ef1146 100644 --- a/fabric-1.20.6/src/main/resources/fabric.mod.json +++ b/fabric-1.20.6/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "org.dynmap.fabric_1_20_4.DynmapMod" + "org.dynmap.fabric_1_20_6.DynmapMod" ] }, "mixins": [