From 0ba89fefc4363b3d5119589851fd80fb7dd4e776 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Thu, 19 May 2022 17:15:49 +0200 Subject: [PATCH] fabric-1.19: rename 1.18.2 -> 1.19 --- .../DynmapMod.java | 2 +- .../DynmapPlugin.java | 26 +++++++++---------- .../FabricAdapter.java | 2 +- .../FabricCommandSender.java | 2 +- .../FabricLogger.java | 2 +- .../FabricMapChunkCache.java | 2 +- .../FabricPlayer.java | 2 +- .../FabricServer.java | 6 ++--- .../FabricWorld.java | 2 +- .../{fabric_1_18_2 => fabric_1_19}/NBT.java | 2 +- .../TaskRecord.java | 2 +- .../VersionCheck.java | 2 +- .../access/ProtoChunkAccessor.java | 2 +- .../command/DmapCommand.java | 4 +-- .../command/DmarkerCommand.java | 4 +-- .../command/DynmapCommand.java | 4 +-- .../command/DynmapCommandExecutor.java | 4 +-- .../command/DynmapExpCommand.java | 4 +-- .../event/BlockEvents.java | 2 +- .../event/CustomServerChunkEvents.java | 2 +- .../event/CustomServerLifecycleEvents.java | 2 +- .../event/PlayerEvents.java | 2 +- .../event/ServerChatEvents.java | 2 +- .../mixin/BiomeEffectsAccessor.java | 2 +- .../mixin/MinecraftServerMixin.java | 4 +-- .../mixin/PlayerManagerMixin.java | 4 +-- .../mixin/ProtoChunkMixin.java | 4 +-- .../mixin/ServerPlayNetworkHandlerMixin.java | 6 ++--- .../mixin/ServerPlayerEntityMixin.java | 4 +-- .../mixin/ThreadedAnvilChunkStorageMixin.java | 6 ++--- .../mixin/WorldChunkMixin.java | 4 +-- .../permissions/FilePermissions.java | 4 +-- .../permissions/OpPermissions.java | 4 +-- .../permissions/PermissionProvider.java | 2 +- .../src/main/resources/dynmap.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 4 +-- 36 files changed, 67 insertions(+), 67 deletions(-) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/DynmapMod.java (98%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/DynmapPlugin.java (97%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricAdapter.java (91%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricCommandSender.java (96%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricLogger.java (96%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricMapChunkCache.java (99%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricPlayer.java (99%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricServer.java (99%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/FabricWorld.java (99%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/NBT.java (98%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/TaskRecord.java (96%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/VersionCheck.java (99%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/access/ProtoChunkAccessor.java (65%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/command/DmapCommand.java (60%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/command/DmarkerCommand.java (61%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/command/DynmapCommand.java (61%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/command/DynmapCommandExecutor.java (96%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/command/DynmapExpCommand.java (62%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/event/BlockEvents.java (97%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/event/CustomServerChunkEvents.java (94%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/event/CustomServerLifecycleEvents.java (93%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/event/PlayerEvents.java (98%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/event/ServerChatEvents.java (94%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/BiomeEffectsAccessor.java (86%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/MinecraftServerMixin.java (83%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/PlayerManagerMixin.java (93%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/ProtoChunkMixin.java (91%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/ServerPlayNetworkHandlerMixin.java (94%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/ServerPlayerEntityMixin.java (93%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/ThreadedAnvilChunkStorageMixin.java (88%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/mixin/WorldChunkMixin.java (90%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/permissions/FilePermissions.java (96%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/permissions/OpPermissions.java (93%) rename fabric-1.19/src/main/java/org/dynmap/{fabric_1_18_2 => fabric_1_19}/permissions/PermissionProvider.java (89%) diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapMod.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapMod.java similarity index 98% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapMod.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapMod.java index db446234..3bcf5f32 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapMod.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapPlugin.java similarity index 97% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapPlugin.java index 49a1955b..280f6923 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; @@ -39,18 +39,18 @@ 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_18_2.command.DmapCommand; -import org.dynmap.fabric_1_18_2.command.DmarkerCommand; -import org.dynmap.fabric_1_18_2.command.DynmapCommand; -import org.dynmap.fabric_1_18_2.command.DynmapExpCommand; -import org.dynmap.fabric_1_18_2.event.BlockEvents; -import org.dynmap.fabric_1_18_2.event.CustomServerChunkEvents; -import org.dynmap.fabric_1_18_2.event.CustomServerLifecycleEvents; -import org.dynmap.fabric_1_18_2.event.PlayerEvents; -import org.dynmap.fabric_1_18_2.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_18_2.permissions.FilePermissions; -import org.dynmap.fabric_1_18_2.permissions.OpPermissions; -import org.dynmap.fabric_1_18_2.permissions.PermissionProvider; +import org.dynmap.fabric_1_19.command.DmapCommand; +import org.dynmap.fabric_1_19.command.DmarkerCommand; +import org.dynmap.fabric_1_19.command.DynmapCommand; +import org.dynmap.fabric_1_19.command.DynmapExpCommand; +import org.dynmap.fabric_1_19.event.BlockEvents; +import org.dynmap.fabric_1_19.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_19.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_19.event.PlayerEvents; +import org.dynmap.fabric_1_19.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_19.permissions.FilePermissions; +import org.dynmap.fabric_1_19.permissions.OpPermissions; +import org.dynmap.fabric_1_19.permissions.PermissionProvider; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricAdapter.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricAdapter.java similarity index 91% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricAdapter.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricAdapter.java index ee3d9a3a..d10f7060 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricAdapter.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricAdapter.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import net.minecraft.server.world.ServerWorld; import org.dynmap.DynmapLocation; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricCommandSender.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricCommandSender.java similarity index 96% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricCommandSender.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricCommandSender.java index 1280ccc9..29769a68 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricCommandSender.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricCommandSender.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricLogger.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricLogger.java similarity index 96% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricLogger.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricLogger.java index 4253fc89..0aeebc45 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricLogger.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricLogger.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricMapChunkCache.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricMapChunkCache.java similarity index 99% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricMapChunkCache.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricMapChunkCache.java index f7394767..fdea7adc 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricMapChunkCache.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import net.minecraft.nbt.*; import net.minecraft.server.world.ServerChunkManager; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricPlayer.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricPlayer.java similarity index 99% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricPlayer.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricPlayer.java index 8655569c..535ee4a5 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricPlayer.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricPlayer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import com.google.common.collect.Iterables; import com.google.gson.Gson; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricServer.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java similarity index 99% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricServer.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java index 309c9ba2..769821cf 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricServer.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; 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_18_2.event.BlockEvents; -import org.dynmap.fabric_1_18_2.event.ServerChatEvents; +import org.dynmap.fabric_1_19.event.BlockEvents; +import org.dynmap.fabric_1_19.event.ServerChatEvents; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.VisibilityLimit; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricWorld.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricWorld.java similarity index 99% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricWorld.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricWorld.java index 0ae91886..77da953c 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/FabricWorld.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.RegistryKey; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/NBT.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/NBT.java similarity index 98% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/NBT.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/NBT.java index afaec108..2f8b52a5 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/NBT.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/NBT.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import org.dynmap.common.chunk.GenericBitStorage; import org.dynmap.common.chunk.GenericNBTCompound; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/TaskRecord.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/TaskRecord.java similarity index 96% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/TaskRecord.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/TaskRecord.java index ecde4814..1c7e4440 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/TaskRecord.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/TaskRecord.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import java.util.concurrent.FutureTask; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/VersionCheck.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/VersionCheck.java similarity index 99% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/VersionCheck.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/VersionCheck.java index 03ff3f5a..4b6f5bf5 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/VersionCheck.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2; +package org.dynmap.fabric_1_19; import org.dynmap.DynmapCore; import org.dynmap.Log; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/access/ProtoChunkAccessor.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/access/ProtoChunkAccessor.java similarity index 65% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/access/ProtoChunkAccessor.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/access/ProtoChunkAccessor.java index 1b98c24d..350a250b 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/access/ProtoChunkAccessor.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/access/ProtoChunkAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.access; +package org.dynmap.fabric_1_19.access; public interface ProtoChunkAccessor { boolean getTouchedByWorldGen(); diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmapCommand.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmapCommand.java similarity index 60% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmapCommand.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmapCommand.java index 87690eda..d6907648 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmapCommand.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_18_2.command; +package org.dynmap.fabric_1_19.command; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; public class DmapCommand extends DynmapCommandExecutor { public DmapCommand(DynmapPlugin p) { diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmarkerCommand.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmarkerCommand.java similarity index 61% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmarkerCommand.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmarkerCommand.java index e132b941..a5c31f02 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DmarkerCommand.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DmarkerCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_18_2.command; +package org.dynmap.fabric_1_19.command; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; public class DmarkerCommand extends DynmapCommandExecutor { public DmarkerCommand(DynmapPlugin p) { diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommand.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommand.java similarity index 61% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommand.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommand.java index 8e4c3c67..698b847e 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommand.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_18_2.command; +package org.dynmap.fabric_1_19.command; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; public class DynmapCommand extends DynmapCommandExecutor { public DynmapCommand(DynmapPlugin p) { diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommandExecutor.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommandExecutor.java similarity index 96% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommandExecutor.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommandExecutor.java index bf2e90b5..bb4fc01b 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapCommandExecutor.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapCommandExecutor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.command; +package org.dynmap.fabric_1_19.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_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; import java.util.Arrays; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapExpCommand.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapExpCommand.java similarity index 62% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapExpCommand.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapExpCommand.java index 4fb29b79..29df91fc 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/command/DynmapExpCommand.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/command/DynmapExpCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_18_2.command; +package org.dynmap.fabric_1_19.command; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; public class DynmapExpCommand extends DynmapCommandExecutor { public DynmapExpCommand(DynmapPlugin p) { diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/BlockEvents.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/BlockEvents.java similarity index 97% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/BlockEvents.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/BlockEvents.java index 9ad017ca..3fefe2fa 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/BlockEvents.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/BlockEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.event; +package org.dynmap.fabric_1_19.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerChunkEvents.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerChunkEvents.java similarity index 94% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerChunkEvents.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerChunkEvents.java index 5f3a1c9f..ee756e20 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerChunkEvents.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerChunkEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.event; +package org.dynmap.fabric_1_19.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerLifecycleEvents.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerLifecycleEvents.java similarity index 93% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerLifecycleEvents.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerLifecycleEvents.java index 8ac46ae2..b6385ddd 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/CustomServerLifecycleEvents.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/CustomServerLifecycleEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.event; +package org.dynmap.fabric_1_19.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/PlayerEvents.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/PlayerEvents.java similarity index 98% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/PlayerEvents.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/PlayerEvents.java index 1d584861..fc02bd34 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/PlayerEvents.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/PlayerEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.event; +package org.dynmap.fabric_1_19.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/ServerChatEvents.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/ServerChatEvents.java similarity index 94% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/ServerChatEvents.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/ServerChatEvents.java index 2724320b..6ab805c4 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/event/ServerChatEvents.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/event/ServerChatEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.event; +package org.dynmap.fabric_1_19.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/BiomeEffectsAccessor.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/BiomeEffectsAccessor.java similarity index 86% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/BiomeEffectsAccessor.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/BiomeEffectsAccessor.java index f1d75396..ab6e135c 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/BiomeEffectsAccessor.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/BiomeEffectsAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.world.biome.BiomeEffects; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/MinecraftServerMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/MinecraftServerMixin.java similarity index 83% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/MinecraftServerMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/MinecraftServerMixin.java index b3d1e82f..6eee0d55 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/MinecraftServerMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/MinecraftServerMixin.java @@ -1,7 +1,7 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.server.MinecraftServer; -import org.dynmap.fabric_1_18_2.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/PlayerManagerMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/PlayerManagerMixin.java similarity index 93% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/PlayerManagerMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/PlayerManagerMixin.java index 2a733175..a356cf25 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/PlayerManagerMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/PlayerManagerMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; -import org.dynmap.fabric_1_18_2.event.PlayerEvents; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ProtoChunkMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ProtoChunkMixin.java similarity index 91% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ProtoChunkMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ProtoChunkMixin.java index e591e8b2..4d0856be 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ProtoChunkMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ProtoChunkMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.ProtoChunk; -import org.dynmap.fabric_1_18_2.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java similarity index 94% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java index 9a373518..4fda22fc 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -13,8 +13,8 @@ import net.minecraft.util.math.BlockPos; import java.util.List; -import org.dynmap.fabric_1_18_2.event.BlockEvents; -import org.dynmap.fabric_1_18_2.event.ServerChatEvents; +import org.dynmap.fabric_1_19.event.BlockEvents; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayerEntityMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayerEntityMixin.java similarity index 93% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayerEntityMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayerEntityMixin.java index 769136a8..a2b1edd6 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ServerPlayerEntityMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayerEntityMixin.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.mixin; import net.minecraft.entity.Entity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import org.dynmap.fabric_1_18_2.event.PlayerEvents; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ThreadedAnvilChunkStorageMixin.java similarity index 88% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ThreadedAnvilChunkStorageMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ThreadedAnvilChunkStorageMixin.java index d26ea0c1..908fd912 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/ThreadedAnvilChunkStorageMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ThreadedAnvilChunkStorageMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.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_18_2.access.ProtoChunkAccessor; -import org.dynmap.fabric_1_18_2.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_19.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/WorldChunkMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/WorldChunkMixin.java similarity index 90% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/WorldChunkMixin.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/WorldChunkMixin.java index 6d3b1059..fee76172 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/mixin/WorldChunkMixin.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/WorldChunkMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_18_2.mixin; +package org.dynmap.fabric_1_19.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_18_2.event.BlockEvents; +import org.dynmap.fabric_1_19.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.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/FilePermissions.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/FilePermissions.java similarity index 96% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/FilePermissions.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/FilePermissions.java index f9ac9012..78f21d3b 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/FilePermissions.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/FilePermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_18_2.permissions; +package org.dynmap.fabric_1_19.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; import java.io.File; import java.util.HashMap; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/OpPermissions.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/OpPermissions.java similarity index 93% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/OpPermissions.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/OpPermissions.java index bb5c43ed..fdf9369b 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/OpPermissions.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/OpPermissions.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_18_2.permissions; +package org.dynmap.fabric_1_19.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.fabric_1_19.DynmapPlugin; import java.util.HashSet; import java.util.Set; diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/PermissionProvider.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/PermissionProvider.java similarity index 89% rename from fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/PermissionProvider.java rename to fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/PermissionProvider.java index 3a36249e..7affe811 100644 --- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_18_2/permissions/PermissionProvider.java +++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_18_2.permissions; +package org.dynmap.fabric_1_19.permissions; import net.minecraft.entity.player.PlayerEntity; diff --git a/fabric-1.19/src/main/resources/dynmap.mixins.json b/fabric-1.19/src/main/resources/dynmap.mixins.json index 9ab81811..c5c9e89b 100644 --- a/fabric-1.19/src/main/resources/dynmap.mixins.json +++ b/fabric-1.19/src/main/resources/dynmap.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.dynmap.fabric_1_18_2.mixin", + "package": "org.dynmap.fabric_1_19.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ "BiomeEffectsAccessor", diff --git a/fabric-1.19/src/main/resources/fabric.mod.json b/fabric-1.19/src/main/resources/fabric.mod.json index 3abb52b0..bb3637b2 100644 --- a/fabric-1.19/src/main/resources/fabric.mod.json +++ b/fabric-1.19/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "org.dynmap.fabric_1_18_2.DynmapMod" + "org.dynmap.fabric_1_19.DynmapMod" ] }, "mixins": [ @@ -28,6 +28,6 @@ "depends": { "fabricloader": ">=0.13.3", "fabric": ">=0.47.8", - "minecraft": ">=1.18.2" + "minecraft": "1.19.x" } }