diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2c6067f..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,3 +0,0 @@ -include: - - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml' - - remote: 'https://jfmods.gitlab.io/scripts/docs.yml' \ No newline at end of file diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..58fcaf8 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,2 @@ +#link https://jfmods.gitlab.io/scripts/jfmod.yml +#link https://jfmods.gitlab.io/scripts/docs.yml \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 00f7b81..0000000 --- a/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle" - -repositories { - maven { url = "https://maven.shedaniel.me/"; name = "Cloth Config" } - maven { - name = "vram" - url = "https://maven.vram.io/" - } - maven { - url "https://quantumfusion.dev/maven/" - content { - includeGroup "dev.quantumfusion" - includeGroup "dev.quantumfusion.dashloader" - } - } - maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" } -} - -dependencies { - modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") - include modImplementation("io.gitlab.jfronny:muscript:${project.muscript_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.libjf_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}") - modClientCompileOnly("io.vram:frex-fabric-mc119:+") - - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}") - modLocalRuntime("com.terraformersmc:modmenu:4.0.6") - - testImplementation('org.junit.jupiter:junit-jupiter:5.9.0') - - // Canvas for FREX testing -// modRuntimeOnly("io.vram:canvas-fabric-mc118:+") { -// exclude(group: "me.shedaniel.cloth") -// } - - // DashLoader "compatibility" -// clientRuntimeOnly("dev.quantumfusion.dashloader:dashloader-definitions:3.0-rc14-1.18") -} - -//TODO re-enable once minecraft classes can be used in tests again -//test { -// useJUnitPlatform() -//} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..00af584 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,45 @@ +import io.gitlab.jfronny.scripts.* + +plugins { + id("jfmod") version "1.2-SNAPSHOT" + id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") +} + +repositories { + maven("https://maven.shedaniel.me/") { name = "Cloth Config" } + maven("https://maven.vram.io/") { name = "vram" } + maven("https://quantumfusion.dev/maven/") { + content { + includeGroup("dev.quantumfusion") + includeGroup("dev.quantumfusion.dashloader") + } + } + maven("https://jitpack.io") { name = "jitpack (for StarScript)" } +} + +dependencies { + modImplementation("net.fabricmc.fabric-api:fabric-api:${prop("fabric_version")}") + include(modImplementation("io.gitlab.jfronny:muscript:${prop("muscript_version")}")!!) + modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") + modClientCompileOnly("io.vram:frex-fabric-mc119:+") + + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") + modLocalRuntime("com.terraformersmc:modmenu:4.1.1") + + testImplementation("org.junit.jupiter:junit-jupiter:5.9.0") + + // Canvas for FREX testing +// modRuntimeOnly("io.vram:canvas-fabric-mc118:+") { +// exclude(group: "me.shedaniel.cloth") +// } + + // DashLoader "compatibility" +// clientRuntimeOnly("dev.quantumfusion.dashloader:dashloader-definitions:3.0-rc14-1.18") +} + +//TODO re-enable once minecraft classes can be used in tests again +//test { +// useJUnitPlatform() +//} diff --git a/gradle.properties b/gradle.properties index 2ced830..e5b830a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,18 @@ # 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.11 + maven_group=io.gitlab.jfronny archives_base_name=respackopts -fabric_version=0.60.0+1.19.2 -libjf_version=3.1.0 -muscript_version=2022.7.4+11-13-3 - modrinth_id=respackopts modrinth_required_dependencies=fabric-api, libjf modrinth_optional_dependencies=modmenu curseforge_id=430090 curseforge_required_dependencies=fabric-api, libjf curseforge_optional_dependencies=modmenu + +fabric_version=0.68.0+1.19.2 +libjf_version=3.2.1 +muscript_version=1.0-SNAPSHOT diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c86b228 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +pluginManagement { + val libjf_version: String by settings + repositories { + maven("https://maven.fabricmc.net/") // FabricMC + maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts + gradlePluginPortal() + } + plugins { + id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") version libjf_version + } +} + +rootProject.name = "respackopts" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5157b8c..08f3417 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,35 +1,26 @@ { "schemaVersion": 1, "id": "respackopts", - "version": "${version}", "name": "Resource Pack Options", - "description": "Allows resource packs to expose GUIs to users", - "authors": [ - "JFronny" - ], - "contact": {}, + "version": "${version}", + "description": "Config menus for resource packs", + "authors": ["JFronny"], + "contact": { + "email": "projects.contact@frohnmeyer-wds.de", + "homepage": "https://jfronny.gitlab.io", + "issues": "https://git.frohnmeyer-wds.de/JfMods/Respackopts/issues", + "sources": "https://git.frohnmeyer-wds.de/JfMods/Respackopts" + }, "license": "MIT", "icon": "assets/respackopts/icon.png", "environment": "*", "entrypoints": { - "main": [ - "io.gitlab.jfronny.respackopts.Respackopts" - ], - "client": [ - "io.gitlab.jfronny.respackopts.RespackoptsClient" - ], - "frex": [ - "io.gitlab.jfronny.respackopts.integration.FrexCompat" - ], - "respackopts:save_hook": [ - "io.gitlab.jfronny.respackopts.Respackopts" - ], - "respackopts:client_save_hook": [ - "io.gitlab.jfronny.respackopts.RespackoptsClient" - ], - "libjf:config": [ - "io.gitlab.jfronny.respackopts.RespackoptsConfig" - ] + "main": ["io.gitlab.jfronny.respackopts.Respackopts"], + "client": ["io.gitlab.jfronny.respackopts.RespackoptsClient"], + "frex": ["io.gitlab.jfronny.respackopts.integration.FrexCompat"], + "respackopts:save_hook": ["io.gitlab.jfronny.respackopts.Respackopts"], + "respackopts:client_save_hook": ["io.gitlab.jfronny.respackopts.RespackoptsClient"], + "libjf:config": ["io.gitlab.jfronny.respackopts.RespackoptsConfig"] }, "mixins": [ "respackopts.mixins.json", @@ -40,7 +31,7 @@ ], "depends": { "fabricloader": ">=0.12.0", - "fabric": "*", + "fabric-api": "*", "minecraft": "*", "libjf-base": ">=3.0.0", "libjf-data-manipulation-v0": ">=3.0.0",