fabric-1.18: s/1.17.1/1.18/

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;

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;

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_18.DynmapPlugin.ChatMessage;
-import org.dynmap.fabric_1_17_1.command.DmapCommand;
+import org.dynmap.fabric_1_18.command.DmapCommand;
-import org.dynmap.fabric_1_17_1.command.DmarkerCommand;
+import org.dynmap.fabric_1_18.command.DmarkerCommand;
-import org.dynmap.fabric_1_17_1.command.DynmapCommand;
+import org.dynmap.fabric_1_18.command.DynmapCommand;
-import org.dynmap.fabric_1_17_1.command.DynmapExpCommand;
+import org.dynmap.fabric_1_18.command.DynmapExpCommand;
-import org.dynmap.fabric_1_17_1.event.BlockEvents;
+import org.dynmap.fabric_1_18.event.BlockEvents;
-import org.dynmap.fabric_1_17_1.event.ChunkDataEvents;
+import org.dynmap.fabric_1_18.event.ChunkDataEvents;
-import org.dynmap.fabric_1_17_1.event.CustomServerLifecycleEvents;
+import org.dynmap.fabric_1_18.event.CustomServerLifecycleEvents;
-import org.dynmap.fabric_1_17_1.event.PlayerEvents;
+import org.dynmap.fabric_1_18.event.PlayerEvents;
-import org.dynmap.fabric_1_17_1.mixin.BiomeEffectsAccessor;
+import org.dynmap.fabric_1_18.mixin.BiomeEffectsAccessor;
-import org.dynmap.fabric_1_17_1.mixin.ThreadedAnvilChunkStorageAccessor;
+import org.dynmap.fabric_1_18.mixin.ThreadedAnvilChunkStorageAccessor;
-import org.dynmap.fabric_1_17_1.permissions.FilePermissions;
+import org.dynmap.fabric_1_18.permissions.FilePermissions;
-import org.dynmap.fabric_1_17_1.permissions.OpPermissions;
+import org.dynmap.fabric_1_18.permissions.OpPermissions;
-import org.dynmap.fabric_1_17_1.permissions.PermissionProvider;
+import org.dynmap.fabric_1_18.permissions.PermissionProvider;
 import org.dynmap.permissions.PermissionsHandler;
 import org.dynmap.renderer.DynmapBlockState;
 

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;

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) {

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) {

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) {

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;
 

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) {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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",

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": [