fix forge module issue

mysticdrew · mysticdrew · commit b938bce456b3 · 2024-06-17T20:23:38.000-05:00
diff --git a/Common/src/main/java/journeymap_webmap/Constants.java b/Common/src/main/java/journeymap_webmap/Constants.java
@@ -1,4 +1,4 @@
-package journeymap;
+package journeymap_webmap;
 
 public interface Constants
 {
diff --git a/Common/src/main/java/journeymap_webmap/WebMapServiceProvider.java b/Common/src/main/java/journeymap_webmap/WebMapServiceProvider.java
@@ -1,7 +1,7 @@
-package journeymap;
+package journeymap_webmap;
 
 import journeymap.api.services.WebMapService;
-import journeymap.service.webmap.Webmap;
+import journeymap_webmap.service.webmap.Webmap;
 
 public class WebMapServiceProvider implements WebMapService
 {
diff --git a/Common/src/main/kotlin/journeymap_webmap/common/kotlin/extensions/resources.kt b/Common/src/main/kotlin/journeymap_webmap/common/kotlin/extensions/resources.kt
@@ -1,4 +1,4 @@
-package journeymap.common.kotlin.extensions
+package journeymap_webmap.common.kotlin.extensions
 
 import net.minecraft.client.Minecraft
 import net.minecraft.resources.ResourceLocation
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/Webmap.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/Webmap.kt
@@ -1,12 +1,13 @@
-package journeymap.service.webmap
+package journeymap_webmap.service.webmap
 
 import io.javalin.Javalin
 import io.javalin.http.staticfiles.Location
 import journeymap.client.Constants
 import journeymap.client.JourneymapClient
 import journeymap.client.io.FileHandler
 import journeymap.common.Journeymap
-import journeymap.service.webmap.kotlin.routes.*
+import journeymap_webmap.Constants.MOD_ID
+import journeymap_webmap.service.webmap.kotlin.routes.*
 import net.minecraft.resources.ResourceLocation
 import org.apache.logging.log4j.Logger
 import java.io.File
@@ -54,7 +55,7 @@ object Webmap {
                             val created =
                                 FileHandler.copyResources(
                                     dir,
-                                    ResourceLocation.fromNamespaceAndPath(journeymap.Constants.MOD_ID, "web"),
+                                    ResourceLocation.fromNamespaceAndPath(MOD_ID, "web"),
                                     "",
                                     false
                                 )
@@ -82,7 +83,7 @@ object Webmap {
                 .get("/skin/{uuid}", ::skinGet)
                 .get("/status", ::statusGet)
                 .get("/tiles/tile.png", ::tilesGet)
-                app?.start(port)
+            app?.start(port)
 
         } catch (e: Exception) {
             logger.error("Failed to start server: $e")
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/enums/WebmapStatus.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/enums/WebmapStatus.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.enums
+package journeymap_webmap.service.webmap.kotlin.enums
 
 enum class WebmapStatus(val status: String)
 {
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin
+package journeymap_webmap.service.webmap.kotlin
 
 import io.javalin.http.Context
 import journeymap.common.Journeymap
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/action.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/action.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/data.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/data.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/log.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/log.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import io.javalin.http.Context
 import journeymap.client.log.JMLogger
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/polygons.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/polygons.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/resources.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/resources.kt
@@ -1,13 +1,13 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.mojang.blaze3d.platform.NativeImage
 import io.javalin.http.Context
 import journeymap.client.JourneymapClient
 import journeymap.client.io.FileHandler.ASSETS_JOURNEYMAP_UI
 import journeymap.client.texture.TextureCache
 import journeymap.common.Journeymap
-import journeymap.common.kotlin.extensions.getResourceAsStream
-import journeymap.service.webmap.Webmap
+import journeymap_webmap.common.kotlin.extensions.getResourceAsStream
+import journeymap_webmap.service.webmap.Webmap
 import net.minecraft.client.Minecraft
 import net.minecraft.resources.ResourceLocation
 import org.apache.logging.log4j.Logger
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/skin.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/skin.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.mojang.blaze3d.platform.NativeImage
 import io.javalin.http.ContentType
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/status.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/status.kt
@@ -1,12 +1,12 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import io.javalin.http.ContentType
 import io.javalin.http.Context
 import journeymap.client.JourneymapClient
 import journeymap.client.ui.minimap.MiniMap
-import journeymap.service.webmap.kotlin.enums.WebmapStatus
+import journeymap_webmap.service.webmap.kotlin.enums.WebmapStatus
 import net.minecraft.client.Minecraft
 
 private val GSON: Gson = GsonBuilder().setPrettyPrinting().create()
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/tiles.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/tiles.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.mojang.blaze3d.platform.NativeImage
 import io.javalin.http.ContentType
diff --git a/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/waypoint.kt b/Common/src/main/kotlin/journeymap_webmap/service/webmap/kotlin/routes/waypoint.kt
@@ -1,4 +1,4 @@
-package journeymap.service.webmap.kotlin.routes
+package journeymap_webmap.service.webmap.kotlin.routes
 
 import com.mojang.blaze3d.platform.NativeImage
 import io.javalin.http.ContentType
diff --git a/Common/src/main/resources/META-INF/services/journeymap.api.services.WebMapService b/Common/src/main/resources/META-INF/services/journeymap.api.services.WebMapService
@@ -1 +1 @@
-journeymap.WebMapServiceProvider
+journeymap_webmap.WebMapServiceProvider
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -68,7 +68,7 @@ def modVersion = "${project.mod_version}"
 group = project.group_id
 archivesBaseName = "${project.base_name}-${loaderName}"
 configurations {
-    shade
+//    shade
 }
 
 configurations.all {
diff --git a/Fabric/src/main/java/journeymap_webmap/FabricClient.java b/Fabric/src/main/java/journeymap_webmap/FabricClient.java
diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -42,11 +42,12 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: "com.modrinth.minotaur"
 apply plugin: "maven-publish"
 
-version = "${project.mod_version}+${project.minecraft_version}"
+def loaderName = "forge"
+version = "${project.minecraft_version}-${project.mod_version}"
 def modVersion = "${project.mod_version}"
 
 group = project.group_id
-archivesBaseName = project.base_name
+archivesBaseName = "${project.base_name}-${loaderName}"
 
 configurations {
     shade
@@ -72,16 +73,16 @@ dependencies {
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     compileOnly group: 'info.journeymap', name: 'journeymap-api-forge', version: "${project.journeymap_api_version}-${project.minecraft_version}-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.+'
-    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.20'
+//    testImplementation 'junit:junit:4.12'
+//    testImplementation 'org.mockito:mockito-inline:4.1.+'
+    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.23'
     shade group: 'info.journeymap', name: 'webmap-client', version: project.journeymap_webmap_version, changing: true
 
     //external libs shade
 //    shade group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
-    shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.20'
+    shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.23'
     shade group: 'io.javalin', name: 'javalin', version: '6.0.0'
-    shade group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.3'
+//    shade group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.3'
 
     compileOnly project(":Common")
 }
diff --git a/Forge/src/main/java/journeymap_webmap/JourneymapWebmapForge.java b/Forge/src/main/java/journeymap_webmap/JourneymapWebmapForge.java
@@ -0,0 +1,8 @@
+package journeymap_webmap;
+
+import net.minecraftforge.fml.common.Mod;
+
+@Mod(Constants.MOD_ID)
+public class JourneymapWebmapForge
+{
+}
diff --git a/README.md b/README.md
@@ -30,11 +30,11 @@ The project [WebMap Client][4] contains the javascript resources used by this pr
 
 ### 1. Git the JourneyMap WebMap source
 
-Check out a branch of the JourneyMap WebMap GIT repo to a directory called journeymap-webmap.  For example:
+Check out a branch of the JourneyMap WebMap GIT repo to a directory called journeymap_webmap.  For example:
 
 ```sh
-    git clone git@github.com:TeamJM/journeymap-webmap.git   
-    cd journeymap-webmap-client
+    git clone git@github.com:TeamJM/journeymap_webmap.git   
+    cd journeymap_webmap-client
     git fetch && git checkout (branchname)
 ```
 
@@ -56,7 +56,7 @@ Check out a branch of the JourneyMap WebMap GIT repo to a directory called journ
 To enable HotSwap:
 
 1. Go to File > Settings... > Build, Execution, Deployment > Build Tools > Gradle
-2. For the journeymap-webmap project, change "Build and run using" to "IntelliJ IDEA"
+2. For the journeymap_webmap project, change "Build and run using" to "IntelliJ IDEA"
 
 If builds begin failing with the error "java.lang.UnsupportedClassVersionError:
 org/intellij/erlang/jps/model/JpsErlangModelSerializerExtension", you'll need to use a newer project JDK or simply
@@ -69,8 +69,8 @@ disable the Erlang plugin:
 ### 3. Build the jars
 
 * Update `project.properties` version info
-* Build using Gradle panel > journeymap-webmap > Tasks > build > build
-* The end result will be in `build/libs/journeymap-webmap*.jar`
+* Build using Gradle panel > journeymap_webmap > Tasks > build > build
+* The end result will be in `build/libs/journeymap_webmap*.jar`
 
 #### JourneyMap WebMap includes and/or makes use of the following software under their respective licenses:
 [Javalin][8]:
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ mappings=1.20.6
 minecraft_version=1.21
 journeymap_webmap_version=1.1-SNAPSHOT
 journeymap_api_version=2.0.0
-group_id=info.journeymap
+group_id=info.journeymap_webmap
 name=JourneyMap WebMap
 mod_id=journeymap_webmap
 base_name=journeymap-webmap
diff --git a/settings.gradle b/settings.gradle
@@ -32,6 +32,6 @@ plugins {
 
 rootProject.name = 'journeymap_webmap'
 include("Common")
-//include("Fabric")
+include("Fabric")
 include("Forge")
 //include("NeoForge")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package journeymap;`
	`1`	`+package journeymap_webmap;`
`2`	`2`
`3`	`3`	`public interface Constants`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-package journeymap;`
	`1`	`+package journeymap_webmap;`
`2`	`2`
`3`	`3`	`import journeymap.api.services.WebMapService;`
`4`		`-import journeymap.service.webmap.Webmap;`
	`4`	`+import journeymap_webmap.service.webmap.Webmap;`
`5`	`5`
`6`	`6`	`public class WebMapServiceProvider implements WebMapService`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package journeymap.common.kotlin.extensions`
	`1`	`+package journeymap_webmap.common.kotlin.extensions`
`2`	`2`
`3`	`3`	`import net.minecraft.client.Minecraft`
`4`	`4`	`import net.minecraft.resources.ResourceLocation`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package journeymap.service.webmap.kotlin.enums`
	`1`	`+package journeymap_webmap.service.webmap.kotlin.enums`
`2`	`2`
`3`	`3`	`enum class WebmapStatus(val status: String)`
`4`	`4`	`{`