From 9afe2d7c2955fc3443f1b87b660be69b911bc593 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Thu, 27 Aug 2020 21:31:24 -0400 Subject: [PATCH] Would help if I uploaded the build.gradle and gradle properties --- build.gradle | 49 ++++++++++++++++++++++++++++++++++++++++++++--- gradle.properties | 6 ++++-- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index cfca1f7..65a9d9e 100755 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,7 @@ minecraft { // Recommended logging data for a userdev environment property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE' + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE' enable if you want spam from the scanner. // Recommended logging level for the console property 'forge.logging.console.level', 'debug' @@ -46,6 +47,27 @@ minecraft { source sourceSets.main } } + + //The below if statements are to add args to your gradle.properties file in user home + // (DO NOT add them directly to the gradle.properties file for this project) + // Setting the below properties allows use of your normal Minecraft account in the + // dev environment including having your skin load. Each property also has a comment + // explaining what information to set the value to/format it expects + // One thing to note is because of the caching that goes on, after changing these + // variables, you need to refresh the project and rerun genIntellijRuns/genEclipseRuns + if (project.hasProperty('mc_uuid')) { + //Your uuid without any dashes in the middle + args '--uuid', project.getProperty('mc_uuid') + } + if (project.hasProperty('mc_username')) { + //Your username/display name, this is the name that shows up in chat + // Note: This is not your email, even if you have a Mojang account + args '--username', project.getProperty('mc_username') + } + if (project.hasProperty('mc_accessToken')) { + //Your access token, you can find it in your '.minecraft/launcher_profiles.json' file + args '--accessToken', project.getProperty('mc_accessToken') + } } server { @@ -53,6 +75,7 @@ minecraft { // Recommended logging data for a userdev environment property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE' + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE' enable if you want spam from the scanner. // Recommended logging level for the console property 'forge.logging.console.level', 'debug' @@ -68,12 +91,13 @@ minecraft { workingDirectory project.file('run') // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE' + property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE' + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE' enable if you want spam from the scanner. // Recommended logging level for the console property 'forge.logging.console.level', 'debug' - args '--mod', 'ironchest', '--all', '--output', file('generated/resources/') + args '--mod', 'ironchest', '--all', '--output', file('src/generated/resources/') mods { ironchest { @@ -86,6 +110,11 @@ minecraft { dependencies { minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version + + // compile against the JEI API but do not include it at runtime + compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") + // at runtime, use the full JEI jar + runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") } task buildInfo { @@ -107,8 +136,20 @@ task buildInfo { version = "${minecraft_version}-${mod_version}.${project.buildInfo.buildNum}" +sourceSets { + main { + resources { + srcDirs = [ + "$rootDir/src/main/resources", + "$rootDir/src/generated/resources" + ] + } + } +} + processResources { exclude '**/*.xcf' + from(sourceSets.main.resources.srcDirs) { include 'META-INF/mods.toml' @@ -143,6 +184,8 @@ jar { } } +jar.finalizedBy('reobfJar') + publishing { publications { mavenJava(MavenPublication) { @@ -156,4 +199,4 @@ publishing { maven { url DEPLOY_DIR } } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 058031e..f2c18d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,10 @@ minecraft_version=1.16.1 minecraft_version_toml=16 # Forge Version Information -forge_version=32.0.6 +forge_version=32.0.108 forge_version_toml=32 +jei_version=7.0.+ + # Mappings Information -mappings_version=20200514-1.16 \ No newline at end of file +mappings_version=20200723-1.16.1