Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build.gradle to work in 2020, incorporate changes up to 2018. … #853

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 37 additions & 32 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'de.undercouch:gradle-download-task:1.2'
classpath 'de.undercouch:gradle-download-task:4.1.1'
classpath "org.scala-lang:scala-library:2.11.1"
}
}
Expand All @@ -36,23 +36,28 @@ buildProps.withReader {

repositories {
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven { // the repo from which to get NEI and stuff
name 'CB Repo'
url "http://chickenbones.net/maven"
name 'CB Repo'
url "http://chickenbones.net/maven"
}
ivy {
name 'FMP'
artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
name 'FMP'
artifactPattern "http://files.minecraftforge.net/[module]/[module]-[revision].[ext]"
}
maven {
// OpenComputers maven repo
url = "http://maven.cil.li/"
}
}

dependencies {
compile group: 'codechicken', name: 'NotEnoughItems', version: "${config.version.minecraft}-${config.version.nei}", ext: 'jar', classifier: "dev"
compile group: 'codechicken', name: 'CodeChickenCore', version: "${config.version.minecraft}-${config.version.cccore}", ext: 'jar', classifier: "dev"
compile group: 'codechicken', name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar', classifier: "dev"
compile group: 'codechicken', name: 'NotEnoughItems', version: "${config.version.minecraft}-${config.version.cc.nei}", ext: 'jar', classifier: "dev"
compile group: 'codechicken', name: 'CodeChickenCore', version: "${config.version.minecraft}-${config.version.cc.core}", ext: 'jar', classifier: "dev"
compile group: 'codechicken', name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cc.lib}", ext: 'jar', classifier: "dev"
compile group: 'li.cil.oc', name: 'OpenComputers', version: "MC${config.version.minecraft}-${config.version.oc.api}", ext: 'jar', classifier: "api"
compile fileTree(dir: 'libs', include: '*.jar')
compile fileTree(dir: 'libs', include: '*.zip')
}
Expand Down Expand Up @@ -127,13 +132,13 @@ task apiZip(type: Zip) {
import de.undercouch.gradle.tasks.download.Download

task getLibraries {
def libsFolder = new File('libs')
if (!libsFolder.isDirectory() ) {
libsFolder.mkdirs()
}
def libsFolder = new File('libs')
if (!libsFolder.isDirectory() ) {
libsFolder.mkdirs()
}

def ccSource = 'http://minecraft.curseforge.com/mc-mods/67504-computercraft/files/2216236/download'
def ccDest = new File('libs', 'ComputerCraft-1.65.jar')
def ccSource = 'https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar'
def ccDest = new File('libs', 'ComputerCraft1.75.jar')


if(!ccDest.exists() ){
Expand All @@ -143,29 +148,29 @@ task getLibraries {
}
}

def mtSource = 'http://minetweaker3.powerofbytes.com/download/MineTweaker3-1.7.10-3.0.9C.jar'
def mtDest = new File('libs', 'MineTweaker3-Dev-1.7.10-3.0.9C.jar')
def mtSource = 'https://media.forgecdn.net/files/2338/487/CraftTweaker-1.7.10-3.0.13.jar'
def mtDest = new File('libs', 'CraftTweaker-1.7.10-3.0.13.jar')

if(!mtDest.exists() ){
download {
src mtSource
dest mtDest
}
}
if(!mtDest.exists() ){
download {
src mtSource
dest mtDest
}
}

def cofhSource = 'http://minecraft.curseforge.com/mc-mods/220333-cofhlib/files/2236777/download'
def cofhDest = new File('libs', 'CoFHLib-[1.7.10]1.0.2-160-dev.jar')
def cofhSource = 'https://media.forgecdn.net/files/2388/748/CoFHLib-%5b1.7.10%5d1.2.1-185-dev.jar'
def cofhDest = new File('libs', 'CoFHLib-[1.7.10]1.2.1-185-dev.jar')

if(!cofhDest.exists() ){
download {
src cofhSource
dest cofhDest
}
if(!cofhDest.exists() ){
download {
src cofhSource
dest cofhDest
}
}
}

artifacts {
archives apiZip
}

build.dependsOn "apiZip", "copyBuildXml", "getLibraries"
build.dependsOn "apiZip", "copyBuildXml", "getLibraries"
11 changes: 6 additions & 5 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
version.cccore=1.0.4.35
version.cclib=1.1.1.104
version.forge=10.13.3.1360
version.minecraft=1.7.10
version.forge=10.13.4.1614
version.mod.major=5
version.mod.minor=0
version.mod.revis=5
version.nei=1.0.4.95
version.mod.revis=6
version.cc.core=1.0.7.47
version.cc.lib=1.1.3.138
version.cc.nei=1.0.5.120
version.oc.api=1.7.5.1290
2 changes: 1 addition & 1 deletion src/main/java/minechem/MinechemRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -2941,7 +2941,7 @@ public void RegisterModRecipes()

DecomposerRecipe.add(new DecomposerRecipe(singularity, new PotionChemical[]
{
this.element(ElementEnum.Fm, 148), this.element(ElementEnum.Md, 142), this.element(ElementEnum.No, 133), this.element(ElementEnum.Lr, 124), this.element(ElementEnum.Rf, 107), this.element(ElementEnum.Db, 104), this.element(ElementEnum.Sg, 93), this.element(ElementEnum.Bh, 81), this.element(ElementEnum.Hs, 67), this.element(ElementEnum.Mt, 54), this.element(ElementEnum.Ds, 52), this.element(ElementEnum.Rg, 37), this.element(ElementEnum.Cn, 33), this.element(ElementEnum.Uut, 22)
this.element(ElementEnum.Fm, 148), this.element(ElementEnum.Md, 142), this.element(ElementEnum.No, 133), this.element(ElementEnum.Lr, 124), this.element(ElementEnum.Rf, 107), this.element(ElementEnum.Db, 104), this.element(ElementEnum.Sg, 93), this.element(ElementEnum.Bh, 81), this.element(ElementEnum.Hs, 67), this.element(ElementEnum.Mt, 54), this.element(ElementEnum.Ds, 52), this.element(ElementEnum.Rg, 37), this.element(ElementEnum.Cn, 33), this.element(ElementEnum.Nh, 22)
}));

DecomposerRecipe.add(new DecomposerRecipeSelect(skystone, 0.9F, new DecomposerRecipe[]
Expand Down