diff --git a/.gitignore b/.gitignore index bbf75ff..1ff2116 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,23 @@ -.gradle/ -build/ -eclipse/ -out/ -asm/* +#General use .gitignore for Minecraft modding. + +#Folders +/.gradle/* +/build/* +/eclipse/* +/run/* +/out/* +/asm/* +/bin/* +/libs/* + +#File Extensions *.psd *.iml *.ipr *.iws -*.psd -/bin -*.psd *.classpath *.project -/bin -libs/* -MCFPost.txt \ No newline at end of file + +#Specific files +MCFPost.txt +Thumbs.db \ No newline at end of file diff --git a/build.gradle b/build.gradle index 69840b3..bd59b26 100644 --- a/build.gradle +++ b/build.gradle @@ -1,46 +1,85 @@ buildscript { repositories { mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } + maven { url = "http://files.minecraftforge.net/maven" } + maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'org.ajoberstar:gradle-git:0.10.1' } } apply plugin: 'forge' -version = "1.7.10-1.1.4Beta3" -group= "" -archivesBaseName = "ElectroMagicTools" +ext.configFile = file "build.properties" +configFile.withReader { + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +version = config.mc_version + "-" + config.mod_version + "-" + config.build_number +group= config.package_group +archivesBaseName = config.mod_name + +import org.ajoberstar.grgit.Grgit + +def gitHash = 'unknown' +if (new File(projectDir, '.git').exists()) { + def repo = Grgit.open(project.file('.')) + gitHash = repo.log().find().abbreviatedId +} minecraft { - version = "1.7.10-10.13.0.1208" - assetDir = "eclipse/assets" + version = config.mc_version + "-" + config.forge_version + runDir = "run" + + if (project.hasProperty('mappings_version')) + mappings = project.mappings_version } -dependencies { - compile fileTree(dir: 'libs', include: '*.jar') -} -processResources -{ - // replace stuff in mcmod.info, nothing else +processResources { + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version + include '**/*.info' + include '**/*.properties' + + expand 'version': project.version, 'mcversion': project.minecraft.version } - - // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' + exclude '**/*.info' + exclude '**/*.properties' + exclude '**/*.db' } } + +jar { + dependsOn "incrementBuildNumber" + manifest.mainAttributes( + "Built-By": System.getProperty('user.name'), + "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", + "Implementation-Title": project.name, + "Implementation-Version": project.version, + "Git-Hash": gitHash + ) +} + +tasks.withType(JavaCompile) { task -> + task.options.encoding = 'UTF-8' +} + +task("incrementBuildNumber") { + // increment build number + doFirst { + // increment + config.build_number = (config.build_number.toString().toInteger()) + 1 + + // write back to the file + configFile.withWriter { + config.toProperties().store(it, "") + } + } +} \ No newline at end of file diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..dc0cc19 --- /dev/null +++ b/build.properties @@ -0,0 +1,8 @@ +# +#Sat Sep 27 14:31:53 PDT 2014 +package_group=com.tombenpotter.emt +mc_version=1.7.10 +forge_version=10.13.1.1217 +build_number=2 +mod_version=1.1.4 +mod_name=ElectroMagicTools diff --git a/capes/Thumbs.db b/capes/Thumbs.db deleted file mode 100644 index 7922399..0000000 Binary files a/capes/Thumbs.db and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..3d0dee6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..b0dd98c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Fri Sep 26 11:20:52 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/src/main/resources/Thumbs.db b/src/main/resources/Thumbs.db deleted file mode 100644 index 1aa0879..0000000 Binary files a/src/main/resources/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/Thumbs.db deleted file mode 100644 index 65d3b9f..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/Thumbs.db deleted file mode 100644 index 4ba24e5..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/essentiagenerator/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/machines/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/machines/Thumbs.db deleted file mode 100644 index 5ba0e98..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/machines/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/solars/Thumbs.db deleted file mode 100644 index 934e5fe..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/Thumbs.db deleted file mode 100644 index 04938b4..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/Thumbs.db deleted file mode 100644 index c44a8ed..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/Thumbs.db deleted file mode 100644 index 26e243b..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/Thumbs.db b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/Thumbs.db deleted file mode 100644 index a5f53ad..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/guis/Thumbs.db b/src/main/resources/assets/electromagictools/textures/guis/Thumbs.db deleted file mode 100644 index 64f41b3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/guis/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/Thumbs.db b/src/main/resources/assets/electromagictools/textures/items/Thumbs.db deleted file mode 100644 index 0d99886..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/misc/Thumbs.db b/src/main/resources/assets/electromagictools/textures/misc/Thumbs.db deleted file mode 100644 index 517cfa4..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/misc/Thumbs.db and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/models/Thumbs.db b/src/main/resources/assets/electromagictools/textures/models/Thumbs.db deleted file mode 100644 index 57ba9ae..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/models/Thumbs.db and /dev/null differ