Skip to content

Commit 1ef19b8

Browse files
dmodoomsiriusBrycey92
authored andcommitted
fix missing deps.gradle
1 parent be82b85 commit 1ef19b8

File tree

4 files changed

+77
-23
lines changed

4 files changed

+77
-23
lines changed

build.gradle

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
buildscript {
22
repositories {
3+
maven { url = 'https://files.minecraftforge.net/maven' }
4+
jcenter()
35
mavenCentral()
4-
maven {
5-
name = "forge"
6-
url = "http://files.minecraftforge.net/maven"
7-
}
86
maven {
97
name = "sonatype"
108
url = "https://oss.sonatype.org/content/repositories/snapshots/"
119
}
1210
}
1311
dependencies {
14-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
12+
classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
1513
}
1614
}
1715

@@ -22,7 +20,9 @@ plugins {
2220
id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.64"
2321
}
2422
apply plugin: 'java'
25-
apply plugin: 'net.minecraftforge.gradle.forge'
23+
apply plugin: 'net.minecraftforge.gradle'
24+
apply plugin: 'eclipse'
25+
apply plugin: 'maven-publish'
2626

2727
group= "zmaster587.advancedRocketry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2828
archivesBaseName = "AdvancedRocketry"
@@ -37,19 +37,21 @@ jar {
3737
}
3838

3939
apply from: "gradle/scripts/getbuildnumber.gradle"
40+
41+
sourceCompatibility = 1.8
42+
targetCompatibility = 1.8
43+
4044
minecraft {
41-
version = "1.12.2-14.23.4.2739"
42-
runDir = "run"
43-
mappings = "snapshot_20170624"
44-
sourceCompatibility = 1.8
45-
targetCompatibility = 1.8
46-
replaceIn "src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java"
47-
replace "@MAJOR@", version_major
48-
replace "@MINOR@", version_minor
49-
replace "@REVIS@", version_revis
50-
replace "@BUILD@", project.getBuildNumber()
45+
//runDir = "run"
46+
mappings channel: 'snapshot', version: '20171003-1.12'
47+
48+
// replaceIn "src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java"
49+
// replace "@MAJOR@", version_major
50+
// replace "@MINOR@", version_minor
51+
// replace "@REVIS@", version_revis
52+
// replace "@BUILD@", project.getBuildNumber()
5153

52-
replace "%LIBVULPESVERSION%", project.libVulpesVersion
54+
// replace "%LIBVULPESVERSION%", project.libVulpesVersion
5355
}
5456

5557
apply from: "gradle/scripts/jars.gradle"
@@ -60,14 +62,14 @@ processResources
6062
{
6163
// this will ensure that this task is redone when the versions change.
6264
inputs.property "version", project.version
63-
inputs.property "mcversion", project.minecraft.version
65+
inputs.property "mcversion", "1.12.2"
6466

6567
// replace stuff in mcmod.info, nothing else
6668
from(sourceSets.main.resources.srcDirs) {
6769
include 'mcmod.info'
6870

6971
// replace version and mcversion
70-
expand 'version':project.version, 'mcversion':project.minecraft.version
72+
expand 'version':project.version, 'mcversion':"1.12.2"
7173
}
7274

7375
// copy everything else, thats not the mcmod.info
@@ -105,12 +107,12 @@ curseforge{
105107
changelog = file('changelog.html')
106108
changelogType = 'html'
107109
releaseType = "beta"
108-
addGameVersion minecraft.version
110+
addGameVersion "1.12.2"
109111
mainArtifact(jar) {
110-
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for " + minecraft.version
112+
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for 1.12.2"
111113
}
112114
addArtifact (deobfJar){
113-
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for " + minecraft.version
115+
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for 1.12.2"
114116
}
115117
}
116118
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ mcversion=1.12.2
66
startGitRev=fd7355
77
libVulpesVersion=0.4.2
88
libVulpesBuildNum=81
9+
jei_version=4.16.1.301

gradle/scripts/deps.gradle

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
project.ext { gcbuild = "261" }
2+
3+
apply from: "https://raw.githubusercontent.com/ReadOnlyDevelopment/gradle/galacticraft/dev.gradle"
4+
5+
repositories {
6+
mavenCentral()
7+
/*ivy {
8+
url "https://micdoodle8.com/new-builds/"
9+
layout 'pattern', {
10+
artifact "[organization]/${GCBuild}/[module]-[revision].jar"
11+
}
12+
metadataSources {
13+
artifact()
14+
}
15+
}*/
16+
ivy {
17+
name "LibVulpes"
18+
artifactPattern "http://65.78.115.159:8080/job/LibVulpes/job/libVulpes/job/1.12/" + project.libVulpesBuildNum +"/artifact/output/[module]-[revision].[ext]"
19+
}
20+
maven {
21+
name = "mezz.jei"
22+
url = "https://dvs1.progwml6.com/files/maven/"
23+
}
24+
ivy {
25+
name "industrialcraft-2"
26+
artifactPattern "http://jenkins.ic2.player.to/job/IC2_111/39/artifact/build/libs/[module]-[revision].[ext]"
27+
}
28+
/*ivy {
29+
name "Tesla"
30+
artifactPattern "https://addons-origin.cursecdn.com/files/2347/256/[module]-[revision].[ext]"
31+
}*/
32+
maven {
33+
// location of a maven mirror for JEI files, as a fallback
34+
name = "ModMaven"
35+
url = "https://modmaven.k-4u.nl"
36+
}
37+
}
38+
39+
dependencies {
40+
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854'
41+
compileOnly name: 'industrialcraft-2', version: '2.7.39-ex111-api', ext: 'jar'
42+
//compile name: 'Tesla', version: '1.11-1.3.0.51-deobf', ext: 'jar'
43+
//compile name: 'EnderIO', version: '1.7.10-2.2.8.381', ext: 'jar'
44+
compileOnly name: 'LibVulpes', version: '1.12.2-' + project.libVulpesVersion + '-' + project.libVulpesBuildNum + '-deobf', ext: 'jar'
45+
46+
47+
// compile against the JEI API but do not include it at runtime
48+
compileOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}:api")
49+
// at runtime, use the full JEI jar
50+
runtimeOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}")
51+
}

gradle/scripts/version.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "${project.minecraft.version}-${version_major}.${version_minor}.${version_revis}" + project.getBuildNumber()
1+
version = "1.12.2-${version_major}.${version_minor}.${version_revis}" + project.getBuildNumber()
22

33
//prints the version to the console
44
println "version = "+ version

0 commit comments

Comments
 (0)