Adjust paths

.woodpecker.yml

@@ -43,10 +43,6 @@ pipeline:
       - GRADLE_USER_HOME=${CI_WORKSPACE}/.gradle
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=fat -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=windows -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=linux -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=macos -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
     secrets: [ maven_token, maven_name ]
     when:
       - branch: master
@@ -58,10 +54,6 @@ pipeline:
       - GRADLE_USER_HOME=${CI_WORKSPACE}/.gradle
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=fat -Pdist.platformOnly -Ppublic -Prelease
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=windows -Pdist.platformOnly -Ppublic -Prelease
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=linux -Pdist.platformOnly -Ppublic -Prelease
-      - gradle --build-cache build :launcher-dist:publish -Pflavor=macos -Pdist.platformOnly -Ppublic -Prelease
     secrets: [ maven_token, maven_name ]
     when:
       - event: tag
@@ -96,7 +88,7 @@ pipeline:
       secret_key:
         from_secret: pages_secret
       source: public/**/*
-      target: /${CI_REPO}
+      target: /${CI_REPO}/artifacts
       strip_prefix: public/
     when:
       - branch: master

README.md

@@ -17,4 +17,4 @@ Inceptum utilizes code/libraries/assets from:
 - [gson](https://github.com/google/gson): Used for interacting with various APIs and configs
 - [Ubuntu](https://design.ubuntu.com/font/): Used with nerd font symbols as the font
 - [meteor-client](https://github.com/MeteorDevelopment/meteor-client): A simple HTTP client
-- Several of [my other projects](https://gitlab.com/jfmods)
+- Several of [my other projects](https://git.frohnmeyer-wds.de/explore/repos)

book.toml

@@ -10,7 +10,7 @@ description = "Inceptum Docs"
 build-dir = "public"
 
 [output.html]
-git-repository-url = "https://gitlab.com/jfmods/Inceptum"
-git-repository-icon = "fa-gitlab"
-edit-url-template = "https://gitlab.com/jfmods/Inceptum/edit/master/{path}"
-site-url = "https://jfmods.gitlab.io/inceptum"
+git-repository-url = "https://git.frohnmeyer-wds.de/JfMods/Inceptum"
+git-repository-icon = "fa-git-alt"
+edit-url-template = "https://git.frohnmeyer-wds.de/JfMods/Inceptum/_edit/master/{path}"
+site-url = "https://pages.frohnmeyer-wds.de/JfMods/Inceptum/"

build.gradle.kts

@@ -12,7 +12,7 @@ allprojects {
 
 val lwjglVersion by extra("3.3.1")
 val imguiVersion by extra("1.86.4")
-val jfCommonsVersion by extra("2022.11.2+21-36-56")
+val jfCommonsVersion by extra("1.0-SNAPSHOT")
 val gsonCompileVersion by extra("1.0-SNAPSHOT")
 val jlhttpVersion by extra("2.6")
 val flavorProp: String by extra(prop("flavor", "custom"))

docs/Installing.md

@@ -6,11 +6,11 @@ Inceptum can be installed in a number of ways, all of which are documented below
 
 First, download the Inceptum build appropriate for your system:
 
-- [Windows x86_64](https://gitlab.com/JFronny/inceptum/-/jobs/artifacts/master/raw/Inceptum-windows.jar?job=build_platform_jars)
-- [MacOS x86_64](https://gitlab.com/JFronny/inceptum/-/jobs/artifacts/master/raw/Inceptum-macos.jar?job=build_platform_jars) (untested)
-- [Linux x86_64](https://gitlab.com/JFronny/inceptum/-/jobs/artifacts/master/raw/Inceptum-linux.jar?job=build_platform_jars)
+- [Windows x86_64](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/Inceptum-windows.jar)
+- [MacOS x86_64](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/Inceptum-macos.jar) (untested)
+- [Linux x86_64](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/Inceptum-linux.jar)
 
-You can also download a [single jar](https://gitlab.com/JFronny/inceptum/-/jobs/artifacts/master/raw/Inceptum.jar?job=build_platform_jars)
+You can also download a [single jar](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/Inceptum.jar)
 that contains support for all of these systems (though doing so is not recommended)
 
 Once you have a jar, run it with an [up-to-date java version](https://adoptium.net/).
@@ -32,10 +32,10 @@ If this parameter is specified, all other locations will be ignored.
 ## Simple installation with updates
 
 To use automatic updates, you must use the Inceptum Wrapper.
-Simply launch this [cross-platform jar](https://gitlab.com/JFronny/inceptum/-/jobs/artifacts/master/raw/wrapper.jar?job=build_wrapper)
+Simply launch this [cross-platform jar](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/wrapper.jar)
 and Inceptum will launch as described above (though the initial startup may take a bit longer). The same rules for config locations apply.
 
-You may also download the [windows exe](https://gitlab.com/jfmods/inceptum/-/jobs/artifacts/master/raw/wrapper.exe?job=build_wrapper)
+You may also download the [windows exe](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/wrapper.exe)
 which uses fabric-installer-native-bootstrap to locate the JVM used by the official minecraft launcher and launch Inceptum using that.
 Please be aware that this is pretty much untested
 
@@ -48,6 +48,6 @@ For more information on the syntax of this services config file, go [here](Comma
 
 ## Using Inceptum on Windows without OpenGL drivers
 
-Download the portable build from [here](https://gitlab.com/jfmods/inceptum/-/jobs/artifacts/master/raw/portable.7z?job=portable)
+Download the portable build from [here](https://pages.frohnmeyer-wds.de/JfMods/Inceptum/artifacts/portable.7z)
 This archive includes Inceptum using the Inceptum wrapper, a JVM and a Mesa build for CPU-based graphics.
 Please be aware that using this WILL result in worse performance.

launcher-dist/build.gradle.kts

@@ -26,17 +26,8 @@ tasks.shadowJar {
 
 publishing {
     publications {
-        if (rootProject.hasProperty("dist.platformOnly")) {
-            create<MavenPublication>("shadowed") {
-                artifact(tasks.shadowJar) {
-                    builtBy(tasks.shadowJar)
-                    artifactId = "Inceptum"
-                }
-            }
-        } else {
-            create<MavenPublication>("mavenJava") {
-                from(components["java"])
-            }
+        create<MavenPublication>("mavenJava") {
+            from(components["java"])
         }
     }
 }

settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        maven("https://gitlab.com/api/v4/projects/31672498/packages/maven") // scripts
+        maven("https://maven.frohnmeyer-wds.de/artifacts")
         gradlePluginPortal()
     }
     plugins {