1.19.4

Common/build.gradle

@@ -50,6 +50,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:20.1.0'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+    compileOnly group: 'info.journeymap', name: 'journeymap-api', version: "${project.journeymap_api_version}+${project.minecraft_version}-common-SNAPSHOT", changing: true
 
     // for annotations
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'

Common/src/main/kotlin/journeymap/service/webmap/kotlin/routes/data.kt

@@ -70,7 +70,6 @@ internal fun dataGet(ctx: Context) {
         "animals" -> DataCache.INSTANCE.getAnimals(false).modulesAreTerrible()
         "mobs" -> DataCache.INSTANCE.getMobs(false).modulesAreTerrible()
         "images" -> ImagesData(since!!)
-        "messages" -> DataCache.INSTANCE.getMessages(false)
         "player" -> DataCache.INSTANCE.getPlayer(false)
         "players" -> DataCache.INSTANCE.getPlayers(false).modulesAreTerrible()
         "world" -> DataCache.INSTANCE.getWorld(false)

Common/src/main/kotlin/journeymap/service/webmap/kotlin/routes/skin.kt

@@ -12,16 +12,15 @@ import java.util.*
 internal fun skinGet(ctx: Context)
 {
     val uuid = UUID.fromString(ctx.pathParam("uuid"))
-    val username = Minecraft.getInstance().connection?.getPlayerInfo(uuid)?.profile?.name
-    val img: NativeImage
+    val profile = Minecraft.getInstance().connection?.getPlayerInfo(uuid)?.profile
 
-    img = if (username == null)
+    val img: NativeImage = if (profile == null)
     {
         NativeImage(24, 24, false)
     }
     else
     {
-        IgnSkin.getFaceImage(uuid, username)
+        IgnSkin.getFaceImage(profile)
     }
 
     ctx.contentType(ContentType.IMAGE_PNG)

Fabric/build.gradle

@@ -84,9 +84,10 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings loom.layered() {
         officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_mappings}@zip")
+        parchment("org.parchmentmc.data:parchment-${project.mappings}:${project.parchment_mappings}@zip")
     }
-//    mappings loom.officialMojangMappings()
+
+    modCompileOnly group: 'info.journeymap', name: 'journeymap-api', version: "${project.journeymap_api_version}+${project.minecraft_version}-fabric-SNAPSHOT", changing: true
     modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 

Fabric/src/main/resources/fabric.mod.json

@@ -19,10 +19,10 @@
 
   "environment": "client",
   "depends": {
-    "journeymap": ">=5.10.0",
+    "journeymap": ">=6.0.0",
     "fabricloader": ">=0.14.11",
     "fabric": "*",
-    "minecraft": ">=1.19.3",
+    "minecraft": ">=1.19.4",
     "java": ">=17"
   },
   "custom": {

Forge/build.gradle

@@ -54,7 +54,7 @@ configurations.all {
 dependencies {
     minecraft "net.minecraftforge:forge:${project.forge_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-
+    compileOnly fg.deobf(group: 'info.journeymap', name: 'journeymap-api', version: "${project.journeymap_api_version}+${project.minecraft_version}-forge-SNAPSHOT", changing: true)
 //    implementation fg.deobf("curse.maven:journeymap-32274:${project.jourenymap_forge_version}")
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-inline:4.1.+'
@@ -76,7 +76,7 @@ mixin {
 }
 
 minecraft {
-    mappings channel: project.mappings_channel, version: "${project.parchment_mappings}-${project.minecraft_version}"
+    mappings channel: project.mappings_channel, version: "${project.parchment_mappings}-${project.mappings}"
     accessTransformer = file("src/main/resources/META-INF/accesstransformer.cfg")
     runs {
         client = {

Forge/src/main/resources/META-INF/mods.toml

@@ -1,4 +1,4 @@
-modLoader="javafml"
+modLoader="lowcode"
 loaderVersion="[44,)" #
 issueTrackerURL="https://github.com/TeamJM/journeymap/issues"
 license="All rights reserved"
@@ -20,9 +20,9 @@ Client WebMap for Journeymap. Built: ${date}.
 [[dependencies.journeymap_webmap]]
 modId="forge"
 mandatory=true
-versionRange="[44.0.0,)"
+versionRange="[45.0.0,)"
 
 [[dependencies.journeymap_webmap]]
 modId="journeymap"
 mandatory=true
-versionRange="[5.10.0,)"
+versionRange="[6.0.0,)"

build.gradle

@@ -76,15 +76,16 @@ subprojects {
 
     dependencies {
         implementation group: 'info.journeymap', name: 'webmap-client', version: project.journeymap_webmap_version, changing: true
-        compileOnly "ignored:journeymap:1.19.3-5.9.0-forge"
+        compileOnly "ignored:journeymap:6.0.0+1.19.4-forge"
+        compileOnly "ignored:journeymap:6.0.0+1.19.4-forge"
         // for annotations
         implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
 
         // external libs
         implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.6.10'
         implementation group: 'io.javalin', name: 'javalin', version: '5.3.0'
-        testImplementation "ignored:journeymap:1.19.3-5.9.0-forge"
+        testImplementation "ignored:journeymap:6.0.0+1.19.4-forge"
 
     }
 

gradle.properties

@@ -1,21 +1,23 @@
 mod_version=1.0.0
-minecraft_version=1.19.3
+mappings=1.19.3
+minecraft_version=1.19.4
 journeymap_webmap_version=1.1-SNAPSHOT
+journeymap_api_version=2.0
 group_id=info.journeymap
 name=JourneyMap WebMap
 mod_id=journeymap_webmap
 base_name=journeymap-webmap
-parchment_mappings=2022.12.18
+parchment_mappings=2023.03.12
 
 release_type=release
 # Forge
-mappings=1.19.3
 mappings_channel=parchment
-forge_version=1.19.3-44.1.0
+forge_version=1.19.4-45.0.58
 jourenymap_forge_version=4240527
+
 # Fabric
-fabric_loader_version=0.14.11
-fabric_api_version=0.68.1+1.19.3
+fabric_loader_version=0.14.19
+fabric_api_version=0.80.0+1.19.4
 jourenymap_fabric_version=4240509
 
 # Gradle