diff options
| -rw-r--r-- | build.gradle.kts | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | translations/en_us.json | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 4b5a351..1caf110 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ plugins { id("fabric-loom") version "1.9.2" alias(libs.plugins.shadow) id("moe.nea.licenseextractificator") - id("moe.nea.mc-auto-translations") version "0.1.0" + id("moe.nea.mc-auto-translations") version "0.2.0" } version = getGitTagInfo(libs.versions.minecraft.get()) @@ -163,7 +163,7 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl extendsFrom(getByName(mainSS.annotationProcessorConfigurationName)) } (mainSS.runtimeOnlyConfigurationName) { -// extendsFrom(getByName(ss.runtimeClasspathConfigurationName)) + extendsFrom(getByName(ss.runtimeClasspathConfigurationName)) } ("ksp$upperName") { extendsFrom(ksp.get()) @@ -171,7 +171,8 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl } dependencies { runtimeOnly(ss.output) - (ss.implementationConfigurationName)(sourceSets.main.get().output) + (ss.implementationConfigurationName)(project.files(tasks.compileKotlin)) + (ss.implementationConfigurationName)(project.files(tasks.compileJava)) } tasks.shadowJar { from(ss.output) @@ -181,8 +182,7 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl classpath.from(configurations.getByName(ss.compileClasspathConfigurationName)) } collectTranslations { - // TODO: this does not work, somehow - this.classes.from(sourceSets.main.get().kotlin.classesDirectory) + this.classes.from(ss.kotlin.classesDirectory) } return ss } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e2ced2..4cdd0fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -4,6 +4,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/translations/en_us.json b/translations/en_us.json index 3baab79..aaafc50 100644 --- a/translations/en_us.json +++ b/translations/en_us.json @@ -296,7 +296,6 @@ "firmament.inventory-buttons.import-failed": "One of your buttons could only be imported partially", "firmament.inventory-buttons.load-preset": "Load Preset", "firmament.inventory-buttons.save-preset": "Save Preset", - "firmament.jade.breaking_power": "Required Breaking Power: %s", "firmament.key.category": "Firmament", "firmament.keybinding.external": "%s", "firmament.mixins.start": "Applied firmament mixins:", @@ -349,8 +348,6 @@ "firmament.recipe.mobs.name": "§8[§7Lv %d§8] §c%s", "firmament.recipe.mobs.name.nolevel": "§c%s", "firmament.recipe.novanilla": "Hypixel cannot super craft vanilla recipes", - "firmament.recipecategory.reforge": "Reforge", - "firmament.recipecategory.reforge.basic": "This is a basic reforge, available at the Blacksmith.", "firmament.reiwarning": "Firmament needs RoughlyEnoughItems to display its item list!", "firmament.reiwarning.disable": "Click here to disable this warning", "firmament.reiwarning.disabled": "Disabled the RoughlyEnoughItems warning. Keep in mind that you will not have an item list without REI.", |