diff --git a/Common/build.gradle b/Common/build.gradle index 5ba1e5a..1abaa01 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -1,60 +1,60 @@ -plugins { - id 'java' - id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' - id 'maven-publish' -} - -archivesBaseName = "${mod_id}-common-${minecraft_version}" - -minecraft { - version(minecraft_version) - runs { - if (project.hasProperty('common_runs_enabled') ? project.findProperty('common_runs_enabled').toBoolean() : true) { - - server(project.hasProperty('common_server_run_name') ? project.findProperty('common_server_run_name') : 'vanilla_server') { - workingDirectory(this.file("run")) - } - client(project.hasProperty('common_client_run_name') ? project.findProperty('common_client_run_name') : 'vanilla_client') { - workingDirectory(this.file("run")) - } - } - } -} - -repositories { - maven { url 'https://jitpack.io' } -} - -dependencies { - compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' - implementation("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") - annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") -} - -processResources { - - def buildProps = project.properties.clone() - - filesMatching(['pack.mcmeta']) { - - expand buildProps - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId project.group - artifactId project.archivesBaseName - version project.version - from components.java - } - } - - repositories { - maven { - url "file://" + System.getenv("local_maven") - } - } +plugins { + id 'java' + id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' + id 'maven-publish' +} + +archivesBaseName = "${mod_id}-common-${minecraft_version}" + +minecraft { + version(minecraft_version) + runs { + if (project.hasProperty('common_runs_enabled') ? project.findProperty('common_runs_enabled').toBoolean() : true) { + + server(project.hasProperty('common_server_run_name') ? project.findProperty('common_server_run_name') : 'vanilla_server') { + workingDirectory(this.file("run")) + } + client(project.hasProperty('common_client_run_name') ? project.findProperty('common_client_run_name') : 'vanilla_client') { + workingDirectory(this.file("run")) + } + } + } +} + +repositories { + maven { url 'https://jitpack.io' } +} + +dependencies { + compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + implementation("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}") + annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}") +} + +processResources { + + def buildProps = project.properties.clone() + + filesMatching(['pack.mcmeta']) { + + expand buildProps + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + from components.java + } + } + + repositories { + maven { + url "file://" + System.getenv("local_maven") + } + } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/carryon/lang/tr_tr.json b/Common/src/main/resources/assets/carryon/lang/tr_tr.json new file mode 100644 index 0000000..5a4f512 --- /dev/null +++ b/Common/src/main/resources/assets/carryon/lang/tr_tr.json @@ -0,0 +1,17 @@ +{ + "__comment__": "Translated by @alpeerkaraca", + "carryon.category.settings": "Ayarlar", + "carryon.category.blacklist": "Kara Liste", + "carryon.category.modeloverrides": "Modellerin Üzerine Yaz (Gelişmiş)", + "carryon.category.custompickupconditions": "Özel Yerden Alma Durumları (Gelişmiş)", + "carryon.category.whitelist": "Beyaz Liste", + + "carryon.general.modeloverrides.modeloverrides": "Modellerin Üzerine Yaz", + "carryon.general.blacklist.forbiddenentities": "Oyuncunun Alamayacağı Varlıklar", + "carryon.general.blacklist.forbiddentiles": "Oyuncunun Alamayacağı Bloklar", + "carryon.category.custompickupconditions.custompickupconditionsblocks": "Özel Blok Alma Durumları", + "carryon.category.custompickupconditions.custompickupconditionsentities": "Özel Varlık Alma Durumları", + + "key.carry.desc": "Taşı Taşı", + "key.carry.category": "Taşımaya Devam Et" +} \ No newline at end of file diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 9564cc2..2e2c455 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -33,8 +33,8 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' implementation project(":Common") - include implementation("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") - annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") + include implementation("com.github.llamalad7.mixinextras:mixinextras-fabric:${mixinextras_version}") + annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${mixinextras_version}") modImplementation "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4" include "de.siphalor:amecsapi-1.19:1.3.9+mc1.19.4" diff --git a/Forge/build.gradle b/Forge/build.gradle index 6a7ea44..30c5033 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -1,170 +1,171 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } - maven { url = 'https://maven.parchmentmc.org' } - mavenCentral() - gradlePluginPortal() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' - classpath 'org.parchmentmc:librarian:1.+' - classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' - } -} -apply plugin: 'java' -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'org.spongepowered.mixin' -apply plugin: 'maven-publish' -apply plugin: 'org.parchmentmc.librarian.forgegradle' -apply plugin: 'com.github.johnrengelman.shadow' - -apply from: 'https://raw.githubusercontent.com/MinecraftModDevelopment/Gradle-Collection/22e7d543a18cd30675277fbfa3669e3d9e206010/generic/secrets.gradle' - -if (project.hasProperty('secretFile')) { - loadSecrets(new File((String) findProperty('secretFile'))) -} -if (System.getenv('BUILD_NUMBER') != null) { - version += "." + System.getenv('BUILD_NUMBER') -} - -jarJar.enable() - -archivesBaseName = "${mod_id}-forge-${minecraft_version}" - -mixin { - add sourceSets.main, "${mod_id}.refmap.json" - - config "${mod_id}.mixins.json" - config "${mod_id}.forge.mixins.json" -} - -minecraft { - mappings channel: 'parchment', version: "${parchment_mappings}" - - if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) { - // This location is hardcoded in Forge and can not be changed. - // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - project.logger.debug('Forge Access Transformers are enabled for this project.') - } - - runs { - client { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Client' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" - mods { - modClientRun { - source sourceSets.main - source project(":Common").sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Server' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" - mods { - modServerRun { - source sourceSets.main - source project(":Common").sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - taskName 'Data' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" - mods { - modDataRun { - source sourceSets.main - source project(":Common").sourceSets.main - } - } - } - } -} - -sourceSets.main.resources.srcDir 'src/generated/resources' - -repositories { - maven { - url 'https://maven.blamejared.com' - } - flatDir { - dirs 'libs' - } - maven { url 'https://jitpack.io' } - -} - -dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly project(":Common") - minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") - jarJar(group: 'com.github.LlamaLad7', name: 'MixinExtras', version: "[${mixinextras_version},)") - annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") - //implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2") - //implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2") - annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' - - fileTree("libs").matching { - include "*.jar" - }.each { - String filename = it.getName(); - filename = filename.substring(0, filename.length() - 4); - int lastDash = filename.lastIndexOf("-"); - filename = filename.substring(0, lastDash) + ":" + filename.substring(lastDash+1, filename.length()); - implementation fg.deobf("blank:${filename}") - } -} - -reobf { - jarJar {} -} - -tasks.withType(JavaCompile) { - source(project(":Common").sourceSets.main.allSource) -} - -processResources { - from project(":Common").sourceSets.main.resources - - filesMatching('*.mixins.json') { - expand "refmap_target": "${mod_id}." - } -} - - -jar.finalizedBy('reobfJar') - -publishing { - publications { - mavenJava(MavenPublication) { - groupId project.group - artifactId project.archivesBaseName - version project.version - artifact jar - } - } - repositories { - maven { - url "file://" + System.getenv("local_maven") - } - } -} +buildscript { + repositories { + maven { url = 'https://maven.minecraftforge.net' } + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + maven { url = 'https://maven.parchmentmc.org' } + mavenCentral() + gradlePluginPortal() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + classpath 'org.parchmentmc:librarian:1.+' + classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' + } +} +apply plugin: 'java' +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'org.spongepowered.mixin' +apply plugin: 'maven-publish' +apply plugin: 'org.parchmentmc.librarian.forgegradle' +apply plugin: 'com.github.johnrengelman.shadow' + +apply from: 'https://raw.githubusercontent.com/MinecraftModDevelopment/Gradle-Collection/22e7d543a18cd30675277fbfa3669e3d9e206010/generic/secrets.gradle' + +if (project.hasProperty('secretFile')) { + loadSecrets(new File((String) findProperty('secretFile'))) +} +if (System.getenv('BUILD_NUMBER') != null) { + version += "." + System.getenv('BUILD_NUMBER') +} + +jarJar.enable() + +archivesBaseName = "${mod_id}-forge-${minecraft_version}" + +mixin { + add sourceSets.main, "${mod_id}.refmap.json" + + config "${mod_id}.mixins.json" + config "${mod_id}.forge.mixins.json" +} + +minecraft { + mappings channel: 'parchment', version: "${parchment_mappings}" + + if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) { + // This location is hardcoded in Forge and can not be changed. + // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + project.logger.debug('Forge Access Transformers are enabled for this project.') + } + + runs { + client { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + taskName 'Client' + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modClientRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + taskName 'Server' + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modServerRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + taskName 'Data' + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modDataRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + } +} + +sourceSets.main.resources.srcDir 'src/generated/resources' + +repositories { + maven { + url 'https://maven.blamejared.com' + } + flatDir { + dirs 'libs' + } + maven { url 'https://jitpack.io' } + +} + +dependencies { + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + compileOnly project(":Common") + implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${mixinextras_version}")) + implementation(jarJar("com.github.llamalad7.mixinextras:mixinextras-forge:${mixinextras_version}")) { + jarJar.ranged(it, "[${mixinextras_version},)") + } + //implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2") + //implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2") + annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' + + fileTree("libs").matching { + include "*.jar" + }.each { + String filename = it.getName(); + filename = filename.substring(0, filename.length() - 4); + int lastDash = filename.lastIndexOf("-"); + filename = filename.substring(0, lastDash) + ":" + filename.substring(lastDash+1, filename.length()); + implementation fg.deobf("blank:${filename}") + } +} + +reobf { + jarJar {} +} + +tasks.withType(JavaCompile) { + source(project(":Common").sourceSets.main.allSource) +} + +processResources { + from project(":Common").sourceSets.main.resources + + filesMatching('*.mixins.json') { + expand "refmap_target": "${mod_id}." + } +} + + +jar.finalizedBy('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + artifact jar + } + } + repositories { + maven { + url "file://" + System.getenv("local_maven") + } + } +} diff --git a/gradle.properties b/gradle.properties index 081c54f..ab3845e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,4 +31,4 @@ mod_id=carryon org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mixinextras_version=0.1.1 \ No newline at end of file +mixinextras_version=0.2.0-beta.6 \ No newline at end of file