diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index c428712..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -include: - - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml' diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..f2c1117 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1 @@ +#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml \ No newline at end of file diff --git a/build.gradle b/build.gradle.kts similarity index 54% rename from build.gradle rename to build.gradle.kts index 24ca967..feddc59 100644 --- a/build.gradle +++ b/build.gradle.kts @@ -1,10 +1,15 @@ -apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle" +import io.gitlab.jfronny.scripts.* + +plugins { + id("jfmod") version "1.2-SNAPSHOT" + id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") +} dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-web-v0:${project.libjf_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}") + modImplementation("io.gitlab.jfronny.libjf:libjf-web-v0:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") modLocalRuntime("com.terraformersmc:modmenu:4.0.6") } diff --git a/gradle.properties b/gradle.properties index db3aab2..5741207 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ # check these on https://fabricmc.net/develop/ minecraft_version=1.19.2 -yarn_mappings=build.8 -loader_version=0.14.9 +yarn_mappings=build.24 +loader_version=0.14.11 + maven_group=io.gitlab.jfronny archives_base_name=dynres -fabric_version=0.60.0+1.19.2 -libjf_version=3.0.2 - modrinth_id=dynres modrinth_required_dependencies=libjf modrinth_optional_dependencies=modmenu curseforge_id=407012 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu + +fabric_version=0.68.0+1.19.2 +libjf_version=3.2.1 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5905000 --- /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 = "dynres" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 24778fb..a6fbb1b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,13 +3,13 @@ "id": "dynres", "version": "${version}", "name": "DynRes", - "description": "Host resourcepacks directly in-server", - "authors": [ - "JFronny" - ], + "description": "Host a resource pack directly on your server", + "authors": ["JFronny"], "contact": { - "website": "https://jfronny.gitlab.io", - "repo": "https://www.gitlab.com/jfmods/DynRes" + "email": "projects.contact@frohnmeyer-wds.de", + "homepage": "https://jfronny.gitlab.io", + "issues": "https://git.frohnmeyer-wds.de/JfMods/DynRes/issues", + "sources": "https://git.frohnmeyer-wds.de/JfMods/DynRes" }, "license": "MIT", "icon": "assets/dynres/icon.png",