From 135003faf8d40d9fc209110623b5eba4cc29583e Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 2 Dec 2022 17:23:28 +0100 Subject: [PATCH] Update to new infrastructure --- .gitlab-ci.yml | 2 -- .woodpecker.yml | 1 + build.gradle => build.gradle.kts | 19 ++++++++++++------- gradle.properties | 12 ++++++------ settings.gradle.kts | 13 +++++++++++++ .../io/gitlab/jfronny/modsmod/ModsMod.java | 3 ++- src/main/resources/fabric.mod.json | 12 ++++++------ 7 files changed, 40 insertions(+), 22 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 .woodpecker.yml rename build.gradle => build.gradle.kts (50%) create mode 100644 settings.gradle.kts diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a121a25..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -include: - - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml' \ No newline at end of file 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 50% rename from build.gradle rename to build.gradle.kts index c722228..292c9a9 100644 --- a/build.gradle +++ b/build.gradle.kts @@ -1,12 +1,17 @@ -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-config-core-v1:${project.libjf_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.libjf_version}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${prop("libjf_version")}") // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}") - modLocalRuntime("com.terraformersmc:modmenu:4.0.6") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") + modLocalRuntime("com.terraformersmc:modmenu:4.1.1") } diff --git a/gradle.properties b/gradle.properties index 8a21053..e826cb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # https://fabricmc.net/develop/ minecraft_version=1.19.2 -yarn_mappings=build.8 -loader_version=0.14.9 -# Mod Properties +yarn_mappings=build.24 +loader_version=0.14.11 + maven_group=io.gitlab.jfronny archives_base_name=modsmod -libjf_version=3.0.3 -fabric_version=0.60.0+1.19.2 - modrinth_id=modsmod modrinth_required_dependencies=libjf modrinth_optional_dependencies=modmenu curseforge_id=405095 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu + +libjf_version=3.2.1 +fabric_version=0.68.0+1.19.2 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..9427b73 --- /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 = "modsmod" diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java index 01540e5..9df61c2 100644 --- a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java +++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java @@ -91,7 +91,8 @@ public class ModsMod implements UltraEarlyInit { meta.url.toString(), new ArrayList<>(), new VersionOverrides(), - new DependencyOverrides(FabricLoader.getInstance().getConfigDir())); + new DependencyOverrides(FabricLoader.getInstance().getConfigDir()), + false); FabricLoaderInterface.addMod(LOADER, FabricLoaderInterface.createPlain(meta.rootPath, info, false, new HashSet<>())); } catch (IOException | ParseMetadataException e) { throw new IllegalStateException(e); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c7e3ca6..1538df8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,15 +1,15 @@ { "schemaVersion": 1, "id": "modsmod", - "version": "${version}", "name": "ModsMod", + "version": "${version}", "description": "Dynamically creates and loads empty mods", - "authors": [ - "JFronny" - ], + "authors": ["JFronny"], "contact": { - "website": "https://jfronny.gitlab.io", - "repo": "https://www.gitlab.com/jfmods/ModsMod" + "email": "projects.contact@frohnmeyer-wds.de", + "homepage": "https://jfronny.gitlab.io", + "issues": "https://git.frohnmeyer-wds.de/JfMods/LibJF/issues", + "sources": "https://git.frohnmeyer-wds.de/JfMods/LibJF" }, "license": "MIT", "icon": "assets/modsmod/icon.png",