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 deleted file mode 100644 index c442f0d..0000000 --- a/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle" - -dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.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") -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..b23de15 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,16 @@ +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:${prop("libjf_version")}") + + // Dev env + 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 5921a2b..289768b 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 +yarn_mappings=build.24 +loader_version=0.14.11 maven_group=io.gitlab.jfronny archives_base_name=combit -fabric_version=0.60.0+1.19.2 -libjf_version=3.0.3 - modrinth_id=combit modrinth_required_dependencies=libjf modrinth_optional_dependencies=modmenu, cloth-config curseforge_id=561742 curseforge_required_dependencies=libjf -curseforge_optional_dependencies=modmenu, cloth-config \ No newline at end of file +curseforge_optional_dependencies=modmenu, cloth-config + +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..623b0a9 --- /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 = "combit" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 128aacb..4f1290e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,23 +1,22 @@ { "schemaVersion": 1, "id": "combit", - "version": "${version}", "name": "ComBit", - "description": "Removes delays in combat", - "authors": [ - "JFronny" - ], - "contact": {}, + "version": "${version}", + "description": "Configurable tweaks for combat-related mechanics", + "authors": ["JFronny"], + "contact": { + "email": "projects.contact@frohnmeyer-wds.de", + "homepage": "https://jfronny.gitlab.io", + "issues": "https://git.frohnmeyer-wds.de/JfMods/Combit/issues", + "sources": "https://git.frohnmeyer-wds.de/JfMods/Combit" + }, "license": "MIT", "icon": "assets/combit/icon.png", "environment": "*", "entrypoints": { - "main": [ - "io.gitlab.jfronny.combit.Combit" - ], - "libjf:config": [ - "io.gitlab.jfronny.combit.CombitConfig" - ] + "main": ["io.gitlab.jfronny.combit.Combit"], + "libjf:config": ["io.gitlab.jfronny.combit.CombitConfig"] }, "mixins": [ "combit.mixins.json",