Use new config compiler
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2022-12-29 14:31:08 +01:00
parent 6c5c26f0be
commit 390a704d5c
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 11 additions and 13 deletions

View File

@ -1,16 +1,14 @@
import io.gitlab.jfronny.scripts.*
plugins {
id("jfmod") version "1.2-SNAPSHOT"
id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin")
id("jfmod") version "1.3-SNAPSHOT"
}
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:5.0.0-alpha.4")
modLocalRuntime("com.terraformersmc:modmenu:5.0.2")
}

View File

@ -1,7 +1,7 @@
# https://fabricmc.net/develop/
minecraft_version=1.19.3
yarn_mappings=build.2
loader_version=0.14.11
yarn_mappings=build.5
loader_version=0.14.12
maven_group=io.gitlab.jfronny
archives_base_name=combit
@ -13,5 +13,5 @@ curseforge_id=561742
curseforge_required_dependencies=libjf
curseforge_optional_dependencies=modmenu, cloth-config
fabric_version=0.68.1+1.19.3
libjf_version=3.3.1
fabric_version=0.70.0+1.19.3
libjf_version=3.4.1

View File

@ -1,13 +1,9 @@
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"

View File

@ -129,4 +129,8 @@ public class CombitConfig {
@Preset public static void noInvulnerability() {
iFrameInterval = 0;
}
static {
JFC_CombitConfig.ensureInitialized();
}
}

View File

@ -16,7 +16,7 @@
"environment": "*",
"entrypoints": {
"main": ["io.gitlab.jfronny.combit.Combit"],
"libjf:config": ["io.gitlab.jfronny.combit.CombitConfig"]
"libjf:config": ["io.gitlab.jfronny.combit.JFC_CombitConfig"]
},
"mixins": [
"combit.mixins.json",