diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..7cdb17f --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,2 @@ +#link https://pages.frohnmeyer-wds.de/scripts/docs.yml +#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml \ No newline at end of file diff --git a/book.toml b/book.toml index 38b9306..a1251b9 100644 --- a/book.toml +++ b/book.toml @@ -10,7 +10,7 @@ description = "Documentation for the LibJF library" build-dir = "public" [output.html] -git-repository-url = "https://gitlab.com/jfmods/LibJF" -git-repository-icon = "fa-gitlab" -edit-url-template = "https://gitlab.com/jfmods/LibJF/edit/master/{path}" -site-url = "https://jfmods.gitlab.io/LibJF" +git-repository-url = "https://git.frohnmeyer-wds.de/JfMods/LibJF" +git-repository-icon = "fa-git-alt" +edit-url-template = "https://git.frohnmeyer-wds.de/JfMods/LibJF/_edit/master/{path}" +site-url = "https://pages.frohnmeyer-wds.de/JfMods/LibJF/" diff --git a/build.gradle.kts b/build.gradle.kts index b7b65c3..55396be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import io.gitlab.jfronny.scripts.* plugins { - id("jfmod") version "1.1-SNAPSHOT" + id("jfmod") version "1.2-SNAPSHOT" } val nonModSubprojects: List by extra diff --git a/docs/README.md b/docs/README.md index b6842ba..806746c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ and simplify building fabric mods. My own mods (including LibJF) use these. Otherwise, you can add the repository as follows: ```groovy repositories { - maven { url 'https://gitlab.com/api/v4/projects/25805200/packages/maven' } + maven { url 'https://maven.frohnmeyer-wds.de/artifacts' } } ``` and include LibJF modules like this: diff --git a/docs/config/README.md b/docs/config/README.md index e6a1a97..cb7ad61 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -8,13 +8,9 @@ settings.gradle: ```groovy pluginManagement { repositories { - maven { - name = 'JF Commons' - url = 'https://gitlab.com/api/v4/projects/35745143/packages/maven' - } maven { name = 'LibJF' - url = 'https://gitlab.com/api/v4/projects/25805200/packages/maven' + url = 'https://maven.frohnmeyer-wds.de/artifacts' } } } @@ -27,7 +23,7 @@ plugins { } repositories { - maven { url 'https://gitlab.com/api/v4/projects/25805200/packages/maven' } + maven { url 'https://maven.frohnmeyer-wds.de/artifacts' } } dependencies { diff --git a/gradle.properties b/gradle.properties index b23e9a1..3ede060 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ minecraft_version=1.19.2 -yarn_mappings=build.8 -loader_version=0.14.9 +yarn_mappings=build.28 +loader_version=0.14.10 maven_group=io.gitlab.jfronny.libjf archive_base_name=libjf @@ -14,9 +14,9 @@ modrinth_optional_dependencies=fabric-api curseforge_id=482600 curseforge_optional_dependencies=fabric-api -fabric_version=0.60.0+1.19.2 -commons_version=2022.9.26+17-56-16 -modmenu_version=4.0.6 +fabric_version=0.67.1+1.19.2 +commons_version=1.0-SNAPSHOT +modmenu_version=4.1.1 asm_version=9.4 ant_version=1.10.12 diff --git a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/LibJf.java b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/LibJf.java index 03c713e..e0c56ee 100644 --- a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/LibJf.java +++ b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/LibJf.java @@ -1,6 +1,8 @@ package io.gitlab.jfronny.libjf; -import io.gitlab.jfronny.commons.log.*; +import io.gitlab.jfronny.commons.log.Level; +import io.gitlab.jfronny.commons.log.Logger; +import io.gitlab.jfronny.commons.log.slf4j.SLF4JLogger; import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders; import io.gitlab.jfronny.libjf.gson.GsonAdapter; import io.gitlab.jfronny.libjf.gson.HiddenAnnotationExclusionStrategy; diff --git a/libjf-base/src/main/resources/fabric.mod.json b/libjf-base/src/main/resources/fabric.mod.json index 174cb89..bf72cf2 100644 --- a/libjf-base/src/main/resources/fabric.mod.json +++ b/libjf-base/src/main/resources/fabric.mod.json @@ -7,7 +7,7 @@ "license": "MIT", "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "authors": [ "JFronny" diff --git a/libjf-config-commands-v1/src/main/resources/fabric.mod.json b/libjf-config-commands-v1/src/main/resources/fabric.mod.json index 703f7d4..10011b5 100644 --- a/libjf-config-commands-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-commands-v1/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "authors": ["JFronny"], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "server", diff --git a/libjf-config-compiler-plugin/build.gradle.kts b/libjf-config-compiler-plugin/build.gradle.kts index a71696c..3a69385 100644 --- a/libjf-config-compiler-plugin/build.gradle.kts +++ b/libjf-config-compiler-plugin/build.gradle.kts @@ -1,4 +1,5 @@ import io.gitlab.jfronny.scripts.* +import javax.lang.model.element.Modifier.* plugins { id("java-gradle-plugin") @@ -11,10 +12,7 @@ version = rootProject.version repositories { mavenCentral() - maven { - name = "JF Commons" - url = uri("https://gitlab.com/api/v4/projects/35745143/packages/maven") - } + maven("https://maven.frohnmeyer-wds.de/artifacts") maven("https://maven.fabricmc.net/") } @@ -43,7 +41,7 @@ sourceSets { main { generate(project) { `class`("io.gitlab.jfronny.libjf.config.plugin", "BuildMetadata") { - field("IS_RELEASE", project.hasProperty("release"), "public static final") + field("IS_RELEASE", project.hasProperty("release"), PUBLIC, STATIC, FINAL) } } } diff --git a/libjf-config-core-v1/src/main/resources/fabric.mod.json b/libjf-config-core-v1/src/main/resources/fabric.mod.json index 18dd399..242254c 100644 --- a/libjf-config-core-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-core-v1/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "authors": ["JFronny"], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-config-legacy-shim/src/main/resources/fabric.mod.json b/libjf-config-legacy-shim/src/main/resources/fabric.mod.json index f9d9429..e18b60f 100644 --- a/libjf-config-legacy-shim/src/main/resources/fabric.mod.json +++ b/libjf-config-legacy-shim/src/main/resources/fabric.mod.json @@ -7,7 +7,7 @@ "authors": ["JFronny"], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-config-reflect-v1/src/main/resources/fabric.mod.json b/libjf-config-reflect-v1/src/main/resources/fabric.mod.json index 1a9369b..27daf32 100644 --- a/libjf-config-reflect-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-reflect-v1/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "authors": ["JFronny"], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json b/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json index 2d1402f..7f3bf4f 100644 --- a/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "authors": ["JFronny"], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "client", diff --git a/libjf-data-manipulation-v0/src/main/resources/fabric.mod.json b/libjf-data-manipulation-v0/src/main/resources/fabric.mod.json index 8cd9861..f00bb5c 100644 --- a/libjf-data-manipulation-v0/src/main/resources/fabric.mod.json +++ b/libjf-data-manipulation-v0/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-data-v0/src/main/resources/fabric.mod.json b/libjf-data-v0/src/main/resources/fabric.mod.json index 785b9a6..2dd9435 100644 --- a/libjf-data-v0/src/main/resources/fabric.mod.json +++ b/libjf-data-v0/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-devutil/src/main/resources/fabric.mod.json b/libjf-devutil/src/main/resources/fabric.mod.json index 543eab2..83896b2 100644 --- a/libjf-devutil/src/main/resources/fabric.mod.json +++ b/libjf-devutil/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-translate-v1/src/main/resources/fabric.mod.json b/libjf-translate-v1/src/main/resources/fabric.mod.json index 68c12c6..91abdd1 100644 --- a/libjf-translate-v1/src/main/resources/fabric.mod.json +++ b/libjf-translate-v1/src/main/resources/fabric.mod.json @@ -7,7 +7,7 @@ "license": "MIT", "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "authors": [ "JFronny" diff --git a/libjf-unsafe-v0/src/main/resources/fabric.mod.json b/libjf-unsafe-v0/src/main/resources/fabric.mod.json index f5e35ae..315b911 100644 --- a/libjf-unsafe-v0/src/main/resources/fabric.mod.json +++ b/libjf-unsafe-v0/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/libjf-web-v0/src/main/resources/fabric.mod.json b/libjf-web-v0/src/main/resources/fabric.mod.json index 8f38558..9ba5ebf 100644 --- a/libjf-web-v0/src/main/resources/fabric.mod.json +++ b/libjf-web-v0/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "environment": "*", diff --git a/settings.gradle.kts b/settings.gradle.kts index 3bd6017..6687b76 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { repositories { maven("https://maven.fabricmc.net/") // FabricMC - maven("https://gitlab.com/api/v4/projects/31672498/packages/maven") // scripts + maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts gradlePluginPortal() } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2b1d25c..6aa6058 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/libjf" + "repo": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "icon": "assets/libjf/icon.png",