diff --git a/README.md b/README.md index 23d6e5d..24304b0 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ ChunkyMap is a map renderer for [Dynmap][dynmap] that uses [Chunky][chunky] to r ## Compatibility matrix -| ChunkyMap | Minecraft | Dynmap | Chunky | Branch | Spigot | Fabric | -| ---------- | --------------- | ------- | ------ | -------------- | ------ | ------ | -| 2.7.0 | 1.21.4 or older | 3.8 | 2.5.0 | [master][] | ✅ | ✅ | -| 2.6.0-pre4 | 1.19 or older | 3.2 | 2.4.4 | [chunky-2.4][] | ✅ | | -| 2.5.2 | 1.16 or older | 2.3-3.0 | 2.3.0 | [chunky-2.3][] | ✅ | | +| ChunkyMap | Minecraft | Dynmap | Chunky | Branch | Spigot | Fabric | +| ---------- | ------------- | ------- | ------ | -------------- | ------ | ------ | +| 2.7.0 | 26.2 or older | 3.8 | 2.5.0 | [master][] | ✅ | ✅ | +| 2.6.0-pre4 | 1.19 or older | 3.2 | 2.4.4 | [chunky-2.4][] | ✅ | | +| 2.5.2 | 1.16 or older | 2.3-3.0 | 2.3.0 | [chunky-2.3][] | ✅ | | [master]: https://github.com/leMaik/ChunkyMap/tree/master [chunky-2.4]: https://github.com/leMaik/ChunkyMap/tree/chunky-2.4 diff --git a/chunkymap-core/build.gradle b/chunkymap-core/build.gradle index b19ef3c..bb4c5e2 100644 --- a/chunkymap-core/build.gradle +++ b/chunkymap-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradleup.shadow" version "9.3.1" + id "com.gradleup.shadow" version "9.6.1" } repositories { @@ -31,7 +31,8 @@ dependencies { shadowJar { configurations = [project.configurations.shadow] - exclude "META-INF" + archiveClassifier = "" // Overwrite-non-shadowed jar + exclude "META-INF/**" dependencies { // Explicitly exclude fastutil (otherwise included from chunky-core) diff --git a/chunkymap-core/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMapTile.java b/chunkymap-core/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMapTile.java index 05da87e..dc07f46 100644 --- a/chunkymap-core/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMapTile.java +++ b/chunkymap-core/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMapTile.java @@ -20,6 +20,7 @@ import se.llbit.chunky.entity.PlayerEntity; import se.llbit.chunky.renderer.scene.Scene; import se.llbit.chunky.world.ChunkPosition; +import se.llbit.chunky.world.Dimension; import se.llbit.chunky.world.World; import se.llbit.chunky.world.World.LoggedWarnings; import se.llbit.log.Log; @@ -181,15 +182,15 @@ public boolean render(MapChunkCache mapChunkCache, String mapName) { } } - private static int getChunkyDimension(String environment) { + private static Dimension.Identifier getChunkyDimension(String environment) { switch (environment) { case "nether": - return World.NETHER_DIMENSION; + return Dimension.Identifier.THE_NETHER; case "the_end": - return World.END_DIMENSION; + return Dimension.Identifier.THE_END; case "normal": default: - return World.OVERWORLD_DIMENSION; + return Dimension.Identifier.OVERWORLD; } } @@ -210,7 +211,7 @@ private static Collection getChunksAround(int centerX, int center ArrayList chunks = new ArrayList<>((radius + 1) * (radius + 1)); for (int x = -radius; x <= radius; x++) { for (int z = -radius; z <= radius; z++) { - chunks.add(ChunkPosition.get(centerX + x, centerZ + z)); + chunks.add(new ChunkPosition(centerX + x, centerZ + z)); } } return chunks; diff --git a/chunkymap-fabric/build.gradle b/chunkymap-fabric/build.gradle index 9ad0357..0e4ed58 100644 --- a/chunkymap-fabric/build.gradle +++ b/chunkymap-fabric/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' - id "com.gradleup.shadow" version "9.3.1" + id "com.gradleup.shadow" version "9.6.1" } base { @@ -25,11 +25,10 @@ loom { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" implementation "se.llbit:chunky-core:${project.chunky_version}" @@ -44,7 +43,8 @@ processResources { shadowJar { configurations = [project.configurations.shadow] - exclude "META-INF" + archiveClassifier = "" // Overwrite-non-shadowed jar + exclude "META-INF/**" dependencies { // Explicitly exclude fastutil (otherwise included from chunky-core) @@ -53,21 +53,6 @@ shadowJar { } } -remapJar { - dependsOn shadowJar - mustRunAfter shadowJar - inputFile = file(tasks.shadowJar.archiveFile) -} - -tasks.withType(JavaCompile).configureEach { - it.options.release = 21 -} - -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - // configure the maven publication publishing { publications { diff --git a/chunkymap-fabric/gradle.properties b/chunkymap-fabric/gradle.properties index b09524d..8567858 100644 --- a/chunkymap-fabric/gradle.properties +++ b/chunkymap-fabric/gradle.properties @@ -1,8 +1,8 @@ # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.11 -loader_version=0.18.4 -loom_version=1.15-SNAPSHOT +minecraft_version=26.2 +loader_version=0.19.3 +loom_version=1.17-SNAPSHOT # Dependencies -fabric_api_version=0.141.3+1.21.11 \ No newline at end of file +fabric_api_version=0.155.2+26.2 diff --git a/chunkymap-fabric/src/main/resources/fabric.mod.json b/chunkymap-fabric/src/main/resources/fabric.mod.json index 0b45501..7aa0c00 100644 --- a/chunkymap-fabric/src/main/resources/fabric.mod.json +++ b/chunkymap-fabric/src/main/resources/fabric.mod.json @@ -16,8 +16,8 @@ "main": ["de.lemaik.chunkymap.ChunkyMapMod"] }, "depends": { - "fabricloader": ">=0.18.4", - "minecraft": "~1.21.11", + "fabricloader": ">=${loader_version}", + "minecraft": "~${minecraft_version}", "java": ">=21", "fabric-api": "*" }, diff --git a/chunkymap-spigot/build.gradle b/chunkymap-spigot/build.gradle index 0f00a2f..673c08d 100644 --- a/chunkymap-spigot/build.gradle +++ b/chunkymap-spigot/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradleup.shadow" version "9.3.1" + id "com.gradleup.shadow" version "9.6.1" } repositories { @@ -25,5 +25,6 @@ processResources { shadowJar { configurations = [project.configurations.shadow] - exclude "META-INF" + archiveClassifier = "" // Overwrite-non-shadowed jar + exclude "META-INF/**" } diff --git a/gradle.properties b/gradle.properties index 00b0032..1aedfbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,8 @@ org.gradle.parallel=true org.gradle.configuration-cache=false # Project Properties -version=2.7.0-pre2 +version=2.7.0-pre3 group=de.lemaik.chunkymap archives_base_name=chunkymap -chunky_version=2.5.0-SNAPSHOT.446.ga4b37eb +chunky_version=2.5.0-SNAPSHOT.471.g27f874b diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19a6bde..a351597 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-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index f753ae5..0939251 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,4 +10,4 @@ pluginManagement { } rootProject.name = "chunkymap" -include("chunkymap-core", "chunkymap-spigot", "chunkymap-fabric") \ No newline at end of file +include("chunkymap-core", "chunkymap-spigot", "chunkymap-fabric")