Skip to content

Commit 9aadbbd

Browse files
AndromanderTamaized
authored andcommitted
I'm eating TF now
1 parent a436b18 commit 9aadbbd

File tree

4 files changed

+65
-36
lines changed

4 files changed

+65
-36
lines changed

Diff for: build.gradle

+60-30
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ configFile.withReader {
1010
// For those who want the bleeding edge
1111
buildscript {
1212
repositories {
13+
maven { url = 'https://files.minecraftforge.net/maven' }
1314
jcenter()
14-
maven {
15-
name = "forge"
16-
url = "http://files.minecraftforge.net/maven"
17-
}
15+
mavenCentral()
1816
}
1917
dependencies {
20-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
18+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
2119
}
2220
}
2321
apply plugin: 'java'
2422
apply plugin: 'idea'
25-
apply plugin: 'net.minecraftforge.gradle.forge'
26-
apply plugin: 'maven'
23+
apply plugin: 'net.minecraftforge.gradle'
24+
apply plugin: 'maven-publish'
25+
apply plugin: 'eclipse'
2726

2827
///////////////////////////////////////////////////
2928
// IDE Settings
@@ -40,24 +39,56 @@ idea {
4039
version = (hasProperty("CIRevision") ? CIRevision : config.mod_version)
4140
group = config.group_name
4241
archivesBaseName = "${config.mod_id}-${config.minecraft_version}"
43-
sourceCompatibility = JavaVersion.VERSION_1_8
44-
targetCompatibility = JavaVersion.VERSION_1_8
42+
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
4543

4644
minecraft {
47-
version = config.minecraft_version + "-" + config.forge_version // grab latest forge
48-
runDir = "run"
45+
mappings channel: "snapshot", version: config.mcp_mappings
46+
//version = config.minecraft_version + "-" + config.forge_version // grab latest forge
47+
//makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
48+
accessTransformer = file('src/main/resources/META-INF/tf_at.cfg')
4949

50-
mappings = config.mcp_mappings
51-
makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
50+
//replace '@mod_version@', version
51+
//replace '@mod_id@', config.mod_id
52+
//replace '@ci_build@', hasProperty("CIRevision") ? 'true' : 'false'
5253

53-
replace '@mod_version@', version
54-
replace '@mod_id@', config.mod_id
55-
replace '@ci_build@', hasProperty("CIRevision") ? 'true' : 'false'
54+
//replaceIn 'TwilightForestMod.java'
55+
//replace '@VERSION@', project.version
5656

57-
replaceIn 'TwilightForestMod.java'
58-
replace '@VERSION@', project.version
59-
}
57+
runs {
58+
client {
59+
workingDirectory project.file('run')
60+
61+
// Recommended logging data for a userdev environment
62+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
63+
64+
// Recommended logging level for the console
65+
property 'forge.logging.console.level', 'debug'
66+
67+
mods {
68+
twilightforest {
69+
source sourceSets.main
70+
}
71+
}
72+
}
73+
74+
server {
75+
workingDirectory project.file('run')
76+
77+
// Recommended logging data for a userdev environment
78+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
79+
80+
// Recommended logging level for the console
81+
property 'forge.logging.console.level', 'debug'
6082

83+
mods {
84+
twilightforest {
85+
source sourceSets.main
86+
}
87+
}
88+
}
89+
}
90+
}
91+
/*
6192
processResources {
6293
//replaceIn 'assets/twilightforest/patchouli_books/guide/book.json'
6394
//replace '@EDITION@', project.version
@@ -68,8 +99,8 @@ processResources {
6899
69100
// replace stuff in mcmod.info, nothing else
70101
from(sourceSets.main.resources.srcDirs) {
71-
include '**/*.info'
72-
//include '**/*.properties'
102+
//include '.info'
103+
//include '.properties'
73104
include 'assets/twilightforest/patchouli_books/guide/book.json'
74105
75106
// replace version and mcversion
@@ -89,25 +120,22 @@ processResources {
89120
exclude 'mcmod.info'
90121
exclude 'assets/twilightforest/patchouli_books/guide/book.json'
91122
}
92-
}
123+
}*/
93124

94125
compileJava {
95126
options.encoding = 'UTF-8'
96127
}
97128

98129
jar {
99130
classifier = 'universal'
100-
manifest {
101-
attributes 'FMLAT': 'tf_at.cfg'
102-
}
103131
}
104132

105133
repositories {
106134
maven {
107135
name 'progwm\'s Maven' // JEI + Mantle + TCon
108136
url 'https://dvs1.progwml6.com/files/maven'
109137
}
110-
maven {
138+
/*maven {
111139
name 'tterrag\'s Maven' // CTM
112140
url 'https://maven.tterrag.com/'
113141
}
@@ -122,14 +150,14 @@ repositories {
122150
maven {
123151
name 'Curseforge Maven' // Baubles + Thaumcraft
124152
url 'https://minecraft.curseforge.com/api/maven/'
125-
}
153+
}*/
126154
}
127155

128156
dependencies {
129157
// progwml6
130-
deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}"
158+
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
131159

132-
deobfCompile "slimeknights.mantle:Mantle:${minecraft_sub_version}-${mantle_version}"
160+
/*deobfCompile "slimeknights.mantle:Mantle:${minecraft_sub_version}-${mantle_version}"
133161
deobfCompile "slimeknights:TConstruct:${minecraft_version}-${tcon_version}"
134162
135163
// tterrag
@@ -145,7 +173,9 @@ dependencies {
145173
146174
// curseforge
147175
deobfCompile "baubles:Baubles:${minecraft_sub_version}:${baubles_version}"
148-
deobfCompile "thaumcraft:Thaumcraft:${minecraft_version}:${thaumcraft_version}"
176+
deobfCompile "thaumcraft:Thaumcraft:${minecraft_version}:${thaumcraft_version}"*/
177+
178+
minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
149179
}
150180

151181
task createPom {

Diff for: gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ mod_id=twilightforest
99
group_name=com.github.teamtwilight.twilightforest
1010

1111
#Versions
12-
minecraft_version=1.12.2
13-
minecraft_sub_version=1.12
12+
minecraft_version=1.14.4
13+
minecraft_sub_version=1.14
1414

15-
mcp_mappings=stable_39
16-
forge_version=14.23.5.2847
15+
mcp_mappings=20191122-1.14.3
16+
forge_version=28.1.96
1717

18-
jei_version=4.15.+
18+
jei_version=6.0.0.18
1919

2020
ctm_version=0.3.2.21
2121
chisel_version=+

Diff for: gradle/wrapper/gradle-wrapper.jar

2 Bytes
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#Sun Aug 05 16:14:35 BST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)