diff --git a/common/build.gradle b/common/build.gradle index 948fd2b2..dd683bbc 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -14,7 +14,7 @@ sourceSets { common { java resources { - srcDirs += "src/common-generated/resources" + srcDirs += "src/common_generated/resources" } } main { diff --git a/common/src/common-generated/resources/.cache/db07be184479f34078cd4fc76d248dc0975720e9 b/common/src/common_generated/resources/.cache/27f997e835b3c7bd4c2bb367c0172854e047248d similarity index 71% rename from common/src/common-generated/resources/.cache/db07be184479f34078cd4fc76d248dc0975720e9 rename to common/src/common_generated/resources/.cache/27f997e835b3c7bd4c2bb367c0172854e047248d index b21efbf6..290f5cf7 100644 --- a/common/src/common-generated/resources/.cache/db07be184479f34078cd4fc76d248dc0975720e9 +++ b/common/src/common_generated/resources/.cache/27f997e835b3c7bd4c2bb367c0172854e047248d @@ -1,3 +1,3 @@ -// 1.20.2 2023-09-29T20:03:30.5275487 Languages +// 1.20.4 2024-04-11T19:53:07.7208401 Languages: musicplayer 4fb9f2030f2456883591582a3076a80f0564c072 assets/musicplayer/lang/de_de.json c9dfd65c281498ad527d6403f1d9582ded9169bb assets/musicplayer/lang/en_us.json diff --git a/common/src/common-generated/resources/assets/musicplayer/lang/de_de.json b/common/src/common_generated/resources/assets/musicplayer/lang/de_de.json similarity index 100% rename from common/src/common-generated/resources/assets/musicplayer/lang/de_de.json rename to common/src/common_generated/resources/assets/musicplayer/lang/de_de.json diff --git a/common/src/common-generated/resources/assets/musicplayer/lang/en_us.json b/common/src/common_generated/resources/assets/musicplayer/lang/en_us.json similarity index 100% rename from common/src/common-generated/resources/assets/musicplayer/lang/en_us.json rename to common/src/common_generated/resources/assets/musicplayer/lang/en_us.json diff --git a/forge/build.gradle b/forge/build.gradle index 945aee34..b59f03b8 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -67,26 +67,6 @@ minecraft { } } } - - data { - workingDirectory file("run/data") - property "musicplayer.dev", getRootProject().lavaplayerLibraries() - - args "--mod", config.mod.modid - args "--all" - args "--output", gradlefiles.project("common").file("src/common-generated/resources") - args "--validate" - args "--existing", gradlefiles.project("common").file("src/common/resources") - - property "coremod.uteamcore.dataprovider-set-indent", "coremod.uteamcore.dataprovider-set-indent.value" - property "coremod.uteamcore.dataprovider-set-indent.value", "true" - - mods { - "${config.mod.modid}" { - source sourceSets.main - } - } - } } } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 3fa56fa5..d990da24 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -83,6 +83,8 @@ runs { data { workingDirectory file("run/data").with { mkdirs(); it } + systemProperties "musicplayer.dev", getRootProject().lavaplayerLibraries() + programArguments "--mod", config.mod.modid programArguments "--all" programArguments "--output", gradlefiles.project("common").file("src/common_generated/resources").absolutePath