Skip to content

Commit

Permalink
Updated to TiC v1.8 (no backwards compatibility)
Browse files Browse the repository at this point in the history
 * Unrelated changes: Added Knockback and Sprint Damage stats where applicable
  • Loading branch information
squeek502 committed Jan 1, 2015
1 parent eea6623 commit 8847630
Show file tree
Hide file tree
Showing 19 changed files with 738 additions and 567 deletions.
66 changes: 37 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,40 +1,48 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}

apply plugin: 'forge'

minecraft {
version = "1.7.10-10.13.0.1162"
version = minecraft_version + "-" + forge_version
}

group = project.projectDir.name.toLowerCase()
archivesBaseName = project.projectDir.name + "-mc" + project.minecraft.version

sourceSets.main{
java {
java {
srcDirs 'java', 'apis' //set the source folder as the /src subfolder
}
resources {
resources {
srcDirs 'resources' //set the resources folder as the /resources subfolder
}
}

repositories {
maven {
name "TiC"
url "http://dvs1.progwml6.com/files/maven"
}
}

dependencies {
compile fileTree(dir: 'libs', include: '*.jar,*.zip')
compile "tconstruct:TConstruct:${project.minecraft.version}-${tcon_version}:deobf"
}

// variable replacement in source files
Expand Down Expand Up @@ -62,16 +70,16 @@ afterEvaluate { project ->

processResources
{
// 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'
}
// 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'
}
}
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
minecraft_version=1.7.10
forge_version=10.13.2.1272
tcon_version=1.8.0.build813
2 changes: 1 addition & 1 deletion java/squeek/tictooltips/ModTiCTooltips.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@Mod(modid = ModInfo.MODID, version = ModInfo.VERSION, dependencies = "required-after:TConstruct;after:ExtraTiC;after:TSteelworks;after:Mariculture")
@Mod(modid = ModInfo.MODID, version = ModInfo.VERSION, dependencies = "required-after:TConstruct@[1.7.10-1.8,);after:ExtraTiC;after:TSteelworks;after:Mariculture")
public class ModTiCTooltips
{
public static boolean hasIguanaTweaks;
Expand Down
Loading

0 comments on commit 8847630

Please sign in to comment.