diff --git a/fabric-1.21.3/build.gradle b/fabric-1.21.3/build.gradle index 33397422..7997e43a 100644 --- a/fabric-1.21.3/build.gradle +++ b/fabric-1.21.3/build.gradle @@ -8,7 +8,7 @@ group = parent.group eclipse { project { - name = "Dynmap(Fabric-1.21.3)" + name = "Dynmap(Fabric-1.21)" } } diff --git a/fabric-1.21.3/gradle.properties b/fabric-1.21.3/gradle.properties index f6f0aabf..17faf67f 100644 --- a/fabric-1.21.3/gradle.properties +++ b/fabric-1.21.3/gradle.properties @@ -1,4 +1,4 @@ minecraft_version=1.21.3 yarn_mappings=1.21.3+build.1 loader_version=0.16.9 -fabric_version=0.109.0+1.21.3 +fabric_version=0.108.0+1.21.3 diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapMod.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapMod.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapMod.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapMod.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapPlugin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapPlugin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricAdapter.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricAdapter.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricAdapter.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricAdapter.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricCommandSender.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricCommandSender.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricCommandSender.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricCommandSender.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricLogger.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricLogger.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricLogger.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricLogger.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricMapChunkCache.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricMapChunkCache.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricPlayer.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricPlayer.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricPlayer.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricPlayer.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricServer.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricServer.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricWorld.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricWorld.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricWorld.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricWorld.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/NBT.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/NBT.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/NBT.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/NBT.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/TaskRecord.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/TaskRecord.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/TaskRecord.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/TaskRecord.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/VersionCheck.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/VersionCheck.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/VersionCheck.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/VersionCheck.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/access/ProtoChunkAccessor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/access/ProtoChunkAccessor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/access/ProtoChunkAccessor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/access/ProtoChunkAccessor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmapCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmapCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmapCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmapCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmarkerCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmarkerCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmarkerCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmarkerCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommandExecutor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommandExecutor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommandExecutor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommandExecutor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapExpCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapExpCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapExpCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapExpCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/BlockEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/BlockEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/BlockEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/BlockEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerChunkEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerChunkEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerChunkEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerChunkEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerLifecycleEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerLifecycleEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerLifecycleEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerLifecycleEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/PlayerEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/PlayerEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/PlayerEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/PlayerEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/ServerChatEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/ServerChatEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/ServerChatEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/ServerChatEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/BiomeEffectsAccessor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/BiomeEffectsAccessor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/BiomeEffectsAccessor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/BiomeEffectsAccessor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ChunkGeneratingMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ChunkGeneratingMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ChunkGeneratingMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ChunkGeneratingMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/MinecraftServerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/MinecraftServerMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/MinecraftServerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/MinecraftServerMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/PlayerManagerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/PlayerManagerMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/PlayerManagerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/PlayerManagerMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ProtoChunkMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ProtoChunkMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ProtoChunkMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ProtoChunkMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayNetworkHandlerMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayNetworkHandlerMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayerEntityMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayerEntityMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayerEntityMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayerEntityMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/WorldChunkMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/WorldChunkMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/WorldChunkMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/WorldChunkMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FabricPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FabricPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FabricPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FabricPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FilePermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FilePermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FilePermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FilePermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/LuckPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/LuckPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/LuckPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/LuckPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/OpPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/OpPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/OpPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/OpPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/PermissionProvider.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/PermissionProvider.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/PermissionProvider.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/PermissionProvider.java diff --git a/fabric-1.21.3/src/main/resources/fabric.mod.json b/fabric-1.21.3/src/main/resources/fabric.mod.json index fd62c3aa..8067c753 100644 --- a/fabric-1.21.3/src/main/resources/fabric.mod.json +++ b/fabric-1.21.3/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ "depends": { "fabricloader": ">=0.15.11", - "fabric": ">=0.102.0", - "minecraft": ["1.21.3"] + "fabric": ">=0.98.0", + "minecraft": ["1.21-rc.1", "1.21"] } }