diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/ChunkSnapshot.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/ChunkSnapshot.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/ChunkSnapshot.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/ChunkSnapshot.java index 1426bfd3..21cdbec5 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/ChunkSnapshot.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/ChunkSnapshot.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtList; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapMod.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapMod.java similarity index 98% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapMod.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapMod.java index 31a72f16..274fdc3a 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapMod.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java similarity index 97% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java index 02a8ef35..7c8c5d5e 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; @@ -39,20 +39,20 @@ import org.dynmap.common.BiomeMap; import org.dynmap.common.DynmapCommandSender; import org.dynmap.common.DynmapListenerManager; import org.dynmap.common.DynmapPlayer; -import org.dynmap.fabric_1_17_1.DynmapPlugin.ChatMessage; -import org.dynmap.fabric_1_17_1.command.DmapCommand; -import org.dynmap.fabric_1_17_1.command.DmarkerCommand; -import org.dynmap.fabric_1_17_1.command.DynmapCommand; -import org.dynmap.fabric_1_17_1.command.DynmapExpCommand; -import org.dynmap.fabric_1_17_1.event.BlockEvents; -import org.dynmap.fabric_1_17_1.event.ChunkDataEvents; -import org.dynmap.fabric_1_17_1.event.CustomServerLifecycleEvents; -import org.dynmap.fabric_1_17_1.event.PlayerEvents; -import org.dynmap.fabric_1_17_1.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_17_1.mixin.ThreadedAnvilChunkStorageAccessor; -import org.dynmap.fabric_1_17_1.permissions.FilePermissions; -import org.dynmap.fabric_1_17_1.permissions.OpPermissions; -import org.dynmap.fabric_1_17_1.permissions.PermissionProvider; +import org.dynmap.fabric_1_18.DynmapPlugin.ChatMessage; +import org.dynmap.fabric_1_18.command.DmapCommand; +import org.dynmap.fabric_1_18.command.DmarkerCommand; +import org.dynmap.fabric_1_18.command.DynmapCommand; +import org.dynmap.fabric_1_18.command.DynmapExpCommand; +import org.dynmap.fabric_1_18.event.BlockEvents; +import org.dynmap.fabric_1_18.event.ChunkDataEvents; +import org.dynmap.fabric_1_18.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_18.event.PlayerEvents; +import org.dynmap.fabric_1_18.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_18.mixin.ThreadedAnvilChunkStorageAccessor; +import org.dynmap.fabric_1_18.permissions.FilePermissions; +import org.dynmap.fabric_1_18.permissions.OpPermissions; +import org.dynmap.fabric_1_18.permissions.PermissionProvider; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricAdapter.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricAdapter.java similarity index 91% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricAdapter.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricAdapter.java index 7cad68b8..7f809bce 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricAdapter.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricAdapter.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.minecraft.server.world.ServerWorld; import org.dynmap.DynmapLocation; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricCommandSender.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricCommandSender.java similarity index 96% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricCommandSender.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricCommandSender.java index 5a20ed46..6b001668 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricCommandSender.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricCommandSender.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricLogger.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricLogger.java similarity index 96% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricLogger.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricLogger.java index 8b948c24..10d8c72b 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricLogger.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricLogger.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricMapChunkCache.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricMapChunkCache.java index d72cd488..4b0ba463 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.minecraft.nbt.*; import net.minecraft.server.world.ServerChunkManager; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricPlayer.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricPlayer.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricPlayer.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricPlayer.java index 5b7f963b..f2673939 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricPlayer.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricPlayer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import com.google.common.collect.Iterables; import com.google.gson.Gson; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java index 695074ee..11f7f031 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import com.mojang.authlib.GameProfile; import net.fabricmc.loader.api.FabricLoader; @@ -26,7 +26,7 @@ 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_17_1.event.ServerChatEvents; +import org.dynmap.fabric_1_18.event.ServerChatEvents; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.VisibilityLimit; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java index 79ec123b..c8b61edb 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.RegistryKey; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/SnapshotCache.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/SnapshotCache.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/SnapshotCache.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/SnapshotCache.java index 98608564..f2ef9f35 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/SnapshotCache.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/SnapshotCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import org.dynmap.utils.DynIntHashMap; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/TaskRecord.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/TaskRecord.java similarity index 96% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/TaskRecord.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/TaskRecord.java index df408027..6c67edf8 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/TaskRecord.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/TaskRecord.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import java.util.concurrent.FutureTask; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/VersionCheck.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/VersionCheck.java similarity index 99% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/VersionCheck.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/VersionCheck.java index f6b13700..c1639e39 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/VersionCheck.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1; +package org.dynmap.fabric_1_18; import org.dynmap.DynmapCore; import org.dynmap.Log; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmapCommand.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmapCommand.java similarity index 60% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmapCommand.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmapCommand.java index 0d086559..7c60466f 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmapCommand.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_17_1.command; +package org.dynmap.fabric_1_18.command; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; public class DmapCommand extends DynmapCommandExecutor { public DmapCommand(DynmapPlugin p) { diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmarkerCommand.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmarkerCommand.java similarity index 61% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmarkerCommand.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmarkerCommand.java index 9a18d8c5..4369dfc4 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmarkerCommand.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmarkerCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_17_1.command; +package org.dynmap.fabric_1_18.command; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; public class DmarkerCommand extends DynmapCommandExecutor { public DmarkerCommand(DynmapPlugin p) { diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommand.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommand.java similarity index 61% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommand.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommand.java index 1a8aa9b7..efae58a5 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommand.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_17_1.command; +package org.dynmap.fabric_1_18.command; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; public class DynmapCommand extends DynmapCommandExecutor { public DynmapCommand(DynmapPlugin p) { diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommandExecutor.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommandExecutor.java similarity index 96% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommandExecutor.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommandExecutor.java index 2ead8abd..e60b35f1 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommandExecutor.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommandExecutor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.command; +package org.dynmap.fabric_1_18.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_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; import java.util.Arrays; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapExpCommand.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapExpCommand.java similarity index 62% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapExpCommand.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapExpCommand.java index 5efa7cd7..3eac643e 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapExpCommand.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapExpCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_17_1.command; +package org.dynmap.fabric_1_18.command; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; public class DynmapExpCommand extends DynmapCommandExecutor { public DynmapExpCommand(DynmapPlugin p) { diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/BlockEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java similarity index 94% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/BlockEvents.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java index e4dc467f..f50c1cb9 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/BlockEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.event; +package org.dynmap.fabric_1_18.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ChunkDataEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java similarity index 94% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ChunkDataEvents.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java index 644e8408..d50f50b8 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ChunkDataEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.event; +package org.dynmap.fabric_1_18.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/CustomServerLifecycleEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/CustomServerLifecycleEvents.java similarity index 93% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/CustomServerLifecycleEvents.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/CustomServerLifecycleEvents.java index 18c39661..d05e841e 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/CustomServerLifecycleEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/CustomServerLifecycleEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.event; +package org.dynmap.fabric_1_18.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/PlayerEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/PlayerEvents.java similarity index 98% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/PlayerEvents.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/PlayerEvents.java index 899048f4..cb60625e 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/PlayerEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/PlayerEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.event; +package org.dynmap.fabric_1_18.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ServerChatEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ServerChatEvents.java similarity index 94% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ServerChatEvents.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ServerChatEvents.java index 324abb8e..71506135 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ServerChatEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ServerChatEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.event; +package org.dynmap.fabric_1_18.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/BiomeEffectsAccessor.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/BiomeEffectsAccessor.java similarity index 86% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/BiomeEffectsAccessor.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/BiomeEffectsAccessor.java index 4065c056..435c226f 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/BiomeEffectsAccessor.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/BiomeEffectsAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.world.biome.BiomeEffects; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/MinecraftServerMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/MinecraftServerMixin.java similarity index 83% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/MinecraftServerMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/MinecraftServerMixin.java index 0d7abbb8..d0cf770a 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/MinecraftServerMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/MinecraftServerMixin.java @@ -1,7 +1,7 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.server.MinecraftServer; -import org.dynmap.fabric_1_17_1.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/PlayerManagerMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/PlayerManagerMixin.java similarity index 93% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/PlayerManagerMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/PlayerManagerMixin.java index 8fadb9ce..9b5450bc 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/PlayerManagerMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/PlayerManagerMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; -import org.dynmap.fabric_1_17_1.event.PlayerEvents; +import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayNetworkHandlerMixin.java similarity index 91% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayNetworkHandlerMixin.java index 7bb47d98..26b8c79e 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.server.filter.TextStream; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import org.dynmap.fabric_1_17_1.event.ServerChatEvents; +import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayerEntityMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayerEntityMixin.java similarity index 93% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayerEntityMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayerEntityMixin.java index b0ee7cf0..4ca3d449 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayerEntityMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayerEntityMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.entity.Entity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import org.dynmap.fabric_1_17_1.event.PlayerEvents; +import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageAccessor.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageAccessor.java similarity index 91% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageAccessor.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageAccessor.java index 2c7137eb..3cb7c9c3 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageAccessor.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import net.minecraft.server.world.ChunkHolder; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java similarity index 90% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java index 949ed7ec..cecee77d 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.mixin; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; import net.minecraft.world.chunk.Chunk; -import org.dynmap.fabric_1_17_1.event.ChunkDataEvents; +import org.dynmap.fabric_1_18.event.ChunkDataEvents; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/WorldChunkMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java similarity index 90% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/WorldChunkMixin.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java index 496cd1b4..b59ce04d 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/WorldChunkMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_17_1.mixin; +package org.dynmap.fabric_1_18.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_17_1.event.BlockEvents; +import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/FilePermissions.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/FilePermissions.java similarity index 96% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/FilePermissions.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/FilePermissions.java index 8af0f811..eaf1c421 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/FilePermissions.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/FilePermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_17_1.permissions; +package org.dynmap.fabric_1_18.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; import java.io.File; import java.util.HashMap; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/OpPermissions.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/OpPermissions.java similarity index 93% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/OpPermissions.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/OpPermissions.java index d049c9b3..73d8688f 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/OpPermissions.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/OpPermissions.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_17_1.permissions; +package org.dynmap.fabric_1_18.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_17_1.DynmapPlugin; +import org.dynmap.fabric_1_18.DynmapPlugin; import java.util.HashSet; import java.util.Set; diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/PermissionProvider.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/PermissionProvider.java similarity index 89% rename from fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/PermissionProvider.java rename to fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/PermissionProvider.java index 64ef3b5f..4dbdabff 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/PermissionProvider.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_17_1.permissions; +package org.dynmap.fabric_1_18.permissions; import net.minecraft.entity.player.PlayerEntity; diff --git a/fabric-1.18/src/main/resources/dynmap.mixins.json b/fabric-1.18/src/main/resources/dynmap.mixins.json index 3e47145f..9e8d2f97 100644 --- a/fabric-1.18/src/main/resources/dynmap.mixins.json +++ b/fabric-1.18/src/main/resources/dynmap.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.dynmap.fabric_1_17_1.mixin", + "package": "org.dynmap.fabric_1_18.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ "BiomeEffectsAccessor", diff --git a/fabric-1.18/src/main/resources/fabric.mod.json b/fabric-1.18/src/main/resources/fabric.mod.json index bcc8a43d..b45ac449 100644 --- a/fabric-1.18/src/main/resources/fabric.mod.json +++ b/fabric-1.18/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "org.dynmap.fabric_1_17_1.DynmapMod" + "org.dynmap.fabric_1_18.DynmapMod" ] }, "mixins": [