diff --git a/fabric-1.21.3/build.gradle b/fabric-1.21.3/build.gradle index 7997e43a..19857c33 100644 --- a/fabric-1.21.3/build.gradle +++ b/fabric-1.21.3/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6.11' + id 'fabric-loom' version '1.8.11' } archivesBaseName = "Dynmap" @@ -8,7 +8,7 @@ group = parent.group eclipse { project { - name = "Dynmap(Fabric-1.21)" + name = "Dynmap(Fabric-1.21.3)" } } @@ -36,6 +36,9 @@ dependencies { modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT" compileOnly 'net.luckperms:api:5.4' + + //implementation 'org.xerial:sqlite-jdbc:3.30.1' + shadow group: 'org.xerial', name: 'sqlite-jdbc', version: '3.30.1' } loom { diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapMod.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapMod.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapMod.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapMod.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapPlugin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapPlugin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java index 52a3307c..1eb6a083 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/DynmapPlugin.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java @@ -793,4 +793,4 @@ public class DynmapPlugin { } } } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricAdapter.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricAdapter.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricAdapter.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricAdapter.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricCommandSender.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricCommandSender.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricCommandSender.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricCommandSender.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricLogger.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricLogger.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricLogger.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricLogger.java index 531885d0..1aed4d2c 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricLogger.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricLogger.java @@ -46,4 +46,4 @@ public class FabricLogger implements DynmapLogger { public void warning(String s, Throwable t) { log.warn(DM + s, t); } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricMapChunkCache.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricMapChunkCache.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricPlayer.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricPlayer.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricPlayer.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricPlayer.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricServer.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricServer.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricWorld.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricWorld.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/FabricWorld.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricWorld.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/NBT.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/NBT.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/NBT.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/NBT.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/TaskRecord.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/TaskRecord.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/TaskRecord.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/TaskRecord.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/VersionCheck.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/VersionCheck.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/VersionCheck.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/VersionCheck.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/access/ProtoChunkAccessor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/access/ProtoChunkAccessor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/access/ProtoChunkAccessor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/access/ProtoChunkAccessor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmapCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmapCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmapCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmapCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmarkerCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmarkerCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DmarkerCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DmarkerCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommandExecutor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommandExecutor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapCommandExecutor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapCommandExecutor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapExpCommand.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapExpCommand.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/command/DynmapExpCommand.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/command/DynmapExpCommand.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/BlockEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/BlockEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/BlockEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/BlockEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerChunkEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerChunkEvents.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerChunkEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerChunkEvents.java index a8718808..bb661c91 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerChunkEvents.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerChunkEvents.java @@ -18,4 +18,4 @@ public class CustomServerChunkEvents { public interface ChunkGenerate { void onChunkGenerate(ServerWorld world, Chunk chunk); } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerLifecycleEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerLifecycleEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/CustomServerLifecycleEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/CustomServerLifecycleEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/PlayerEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/PlayerEvents.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/PlayerEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/PlayerEvents.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/ServerChatEvents.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/ServerChatEvents.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/ServerChatEvents.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/ServerChatEvents.java index ed84e13c..8ab6989e 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/event/ServerChatEvents.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/event/ServerChatEvents.java @@ -20,4 +20,4 @@ public class ServerChatEvents { public interface ServerChatCallback { void onChatMessage(ServerPlayerEntity player, String message); } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/BiomeEffectsAccessor.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/BiomeEffectsAccessor.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/BiomeEffectsAccessor.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/BiomeEffectsAccessor.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ChunkGeneratingMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ChunkGeneratingMixin.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ChunkGeneratingMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ChunkGeneratingMixin.java index ed6f428d..9355f2b9 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ChunkGeneratingMixin.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ChunkGeneratingMixin.java @@ -24,4 +24,4 @@ public abstract class ChunkGeneratingMixin { CustomServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(chunkGenerationContext.world(), callbackInfoReturnable.getReturnValue()); } } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/MinecraftServerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/MinecraftServerMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/MinecraftServerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/MinecraftServerMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/PlayerManagerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/PlayerManagerMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/PlayerManagerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/PlayerManagerMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ProtoChunkMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ProtoChunkMixin.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ProtoChunkMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ProtoChunkMixin.java index a4cbdc2e..182ac7f3 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ProtoChunkMixin.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ProtoChunkMixin.java @@ -28,4 +28,4 @@ public class ProtoChunkMixin implements ProtoChunkAccessor { public boolean getTouchedByWorldGen() { return touchedByWorldGen; } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayNetworkHandlerMixin.java similarity index 99% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayNetworkHandlerMixin.java index dfa4105c..4d9c853e 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayNetworkHandlerMixin.java @@ -71,4 +71,4 @@ public abstract class ServerPlayNetworkHandlerMixin { // Cancel the original tryChangeText() since we're calling it ourselves above. ci.cancel(); } -} \ No newline at end of file +} diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayerEntityMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayerEntityMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/ServerPlayerEntityMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/ServerPlayerEntityMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/WorldChunkMixin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/WorldChunkMixin.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/mixin/WorldChunkMixin.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/mixin/WorldChunkMixin.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FabricPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FabricPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FabricPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FabricPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FilePermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FilePermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/FilePermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/FilePermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/LuckPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/LuckPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/LuckPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/LuckPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/OpPermissions.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/OpPermissions.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/OpPermissions.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/OpPermissions.java diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/PermissionProvider.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/permissions/PermissionProvider.java similarity index 100% rename from fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21/permissions/PermissionProvider.java rename to fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/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 8067c753..da4605f1 100644 --- a/fabric-1.21.3/src/main/resources/fabric.mod.json +++ b/fabric-1.21.3/src/main/resources/fabric.mod.json @@ -27,8 +27,8 @@ "accessWidener" : "dynmap.accesswidener", "depends": { - "fabricloader": ">=0.15.11", - "fabric": ">=0.98.0", - "minecraft": ["1.21-rc.1", "1.21"] + "fabricloader": ">=0.16.9", + "fabric": ">=0.108.0", + "minecraft": ["1.21.3"] } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..0aaefbca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME