-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also made the code and default config a little more robust
- Loading branch information
Showing
11 changed files
with
408 additions
and
384 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ LICENSE*.txt | |
| Paulscode*.txt | ||
| run/ | ||
|
|
||
| .idea/ | ||
| eclipse/ | ||
| .gradel/ | ||
| CREDITS-fml.txt | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,147 @@ | ||
|
|
||
| // For those who want the bleeding edge | ||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| maven { | ||
| name = "forge" | ||
| url = "http://files.minecraftforge.net/maven" | ||
| } | ||
| } | ||
| dependencies { | ||
| classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' | ||
| } | ||
| } | ||
| apply plugin: 'net.minecraftforge.gradle.forge' | ||
|
|
||
| /* | ||
| // for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot | ||
| plugins { | ||
| id "net.minecraftforge.gradle.forge" version "2.0.2" | ||
| } | ||
| */ | ||
| version = "1.10" | ||
| group= "colecf.safechat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = "Safechat" | ||
|
|
||
| sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly. | ||
| compileJava { | ||
| sourceCompatibility = targetCompatibility = "1.6" | ||
| } | ||
|
|
||
| minecraft { | ||
| version = "1.10.2-12.18.1.2073" | ||
| runDir = "run" | ||
|
|
||
| // the mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD snapshot are built nightly. | ||
| // stable_# stables are built at the discretion of the MCP team. | ||
| // Use non-default mappings at your own risk. they may not allways work. | ||
| // simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings = "snapshot_20160518" | ||
| // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
| } | ||
|
|
||
| dependencies { | ||
| // you may put jars on which you depend on in ./libs | ||
| // or you may define them like so.. | ||
| //compile "some.group:artifact:version:classifier" | ||
| //compile "some.group:artifact:version" | ||
|
|
||
| // real examples | ||
| //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, | ||
| // except that these dependencies get remapped to your current MCP mappings | ||
| //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
| //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // for more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
|
||
| } | ||
|
|
||
| processResources | ||
| { | ||
| // this will ensure that this task is redone when the versions change. | ||
| inputs.property "version", project.version | ||
| inputs.property "mcversion", project.minecraft.version | ||
|
|
||
| // replace stuff in mcmod.info, nothing else | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| include 'mcmod.info' | ||
|
|
||
| // replace version and mcversion | ||
| expand 'version':project.version, 'mcversion':project.minecraft.version | ||
| } | ||
|
|
||
| // copy everything else, thats not the mcmod.info | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| exclude 'mcmod.info' | ||
| } | ||
| } | ||
| buildscript { | ||
| repositories { | ||
| maven { url = 'https://files.minecraftforge.net/maven' } | ||
| jcenter() | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true | ||
| } | ||
| } | ||
| apply plugin: 'net.minecraftforge.gradle' | ||
| // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. | ||
| apply plugin: 'eclipse' | ||
| apply plugin: 'maven-publish' | ||
|
|
||
| version = '1.16.1' | ||
| group = 'colecf.safechat' // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = 'Safechat' | ||
|
|
||
| sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. | ||
|
|
||
| println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) | ||
| minecraft { | ||
| // The mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD Snapshot are built nightly. | ||
| // stable_# Stables are built at the discretion of the MCP team. | ||
| // Use non-default mappings at your own risk. they may not always work. | ||
| // Simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings channel: 'snapshot', version: '20200514-1.16' | ||
| // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
|
|
||
| // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') | ||
|
|
||
| // Default run configurations. | ||
| // These can be tweaked, removed, or duplicated as needed. | ||
| runs { | ||
| client { | ||
| workingDirectory project.file('run') | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
|
||
| // Recommended logging level for the console | ||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| mods { | ||
| safechat { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| server { | ||
| workingDirectory project.file('run') | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
|
||
| // Recommended logging level for the console | ||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| mods { | ||
| safechat { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data { | ||
| workingDirectory project.file('run') | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
|
||
| // Recommended logging level for the console | ||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| args '--mod', 'safechat', '--all', '--output', file('src/generated/resources/') | ||
|
|
||
| mods { | ||
| safechat { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed | ||
| // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. | ||
| // The userdev artifact is a special name and will get all sorts of transformations applied to it. | ||
| minecraft 'net.minecraftforge:forge:1.16.1-32.0.70' | ||
|
|
||
| // You may put jars on which you depend on in ./libs or you may define them like so.. | ||
| // compile "some.group:artifact:version:classifier" | ||
| // compile "some.group:artifact:version" | ||
|
|
||
| // Real examples | ||
| // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // These dependencies get remapped to your current MCP mappings | ||
| // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // For more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
|
||
| } | ||
|
|
||
| // Example for how to get properties into the manifest for reading by the runtime.. | ||
| jar { | ||
| manifest { | ||
| attributes([ | ||
| "Specification-Title": "Safechat", | ||
| "Specification-Vendor": "Safechatcolecf", | ||
| "Specification-Version": "1.16.1", // We are version 1.16.1 of ourselves | ||
| "Implementation-Title": project.name, | ||
| "Implementation-Version": "${version}", | ||
| "Implementation-Vendor" :"Safechatcolecf", | ||
| "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") | ||
| ]) | ||
| } | ||
| } | ||
|
|
||
| // Example configuration to allow publishing using the maven-publish task | ||
| // This is the preferred method to reobfuscate your jar file | ||
| jar.finalizedBy('reobfJar') | ||
| // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing | ||
| //publish.dependsOn('reobfJar') | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| artifact jar | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| url "file:///${project.projectDir}/mcmodsrepo" | ||
| } | ||
| } | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Mon Sep 14 12:28:28 PDT 2015 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip | ||
| #Sun Jul 19 15:37:58 PDT 2020 | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.