Skip to content

Commit 2c570f9

Browse files
author
Coded
committed
Start 1.13 port
1 parent 5a44693 commit 2c570f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+314
-478
lines changed

build.gradle

+41-210
Original file line numberDiff line numberDiff line change
@@ -2,253 +2,84 @@ buildscript {
22
repositories {
33
jcenter()
44
mavenCentral()
5+
maven { url = "https://files.minecraftforge.net/maven" }
56
maven {
6-
name = "forge"
7-
url = "https://files.minecraftforge.net/maven"
7+
url "https://plugins.gradle.org/m2/"
8+
}
9+
}
10+
configurations {
11+
classpath.resolutionStrategy {
12+
cacheDynamicVersionsFor 10, 'seconds'
13+
cacheChangingModulesFor 0, 'seconds'
814
}
915
}
1016
dependencies {
11-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.31"
13-
classpath 'com.selesse:gradle-git-changelog:0.2.+'
14-
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.1.0"
17+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
1518
}
1619
}
1720
plugins {
1821
id "com.github.hierynomus.license" version "0.14.0"
19-
id "com.matthewprenger.cursegradle" version "1.1.0"
22+
id 'java'
2023
}
21-
apply plugin: 'net.minecraftforge.gradle.forge'
22-
apply plugin: 'maven'
23-
apply plugin: 'com.selesse.git.changelog'
24-
apply plugin: 'java'
24+
apply plugin: 'net.minecraftforge.gradle'
25+
apply plugin: 'eclipse'
2526

27+
def BUILD_NUMBER = System.getenv("BUILD_NUMBER") ?: "0"
28+
version = "0.1.0.$BUILD_NUMBER"
29+
group = "com.buuz135"
30+
archivesBaseName = "industrial-foregoing"
2631

27-
String b = ""
28-
if (project.hasProperty("teamcity")) {
29-
b = System.getenv("BUILD_NUMBER")
30-
}
31-
32-
if (b == null || b == "") {
33-
version = "${project.minecraft_version}-${project.mod_version}"
34-
} else {
35-
version = "${project.minecraft_version}-${project.mod_version}-" + b
36-
}
37-
group = "com.buuz135.industrial.IndustrialForegoing" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
38-
archivesBaseName = "industrialforegoing"
39-
40-
sourceCompatibility = "1.8"
41-
targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
32+
sourceCompatibility = targetCompatibility = '1.8'
4233
compileJava {
43-
sourceCompatibility = targetCompatibility = "1.8"
34+
sourceCompatibility = targetCompatibility = '1.8'
4435
}
36+
def MC_VERSION = "1.13"
37+
def MCP_VERSION = "20180921-1.13"
38+
def FORGE_GROUP = "net.minecraftforge.test"
39+
def FORGE_VERSION = "24.0.59-1.13-pre"
4540

4641
minecraft {
47-
version = "1.12.2-14.23.5.2768"
48-
runDir = "run"
49-
50-
// the mappings can be changed at any time, and must be in the following format.
51-
// snapshot_YYYYMMDD snapshot are built nightly.
52-
// stable_# stables are built at the discretion of the MCP team.
53-
// Use non-default mappings at your own risk. they may not always work.
54-
// simply re-run your setup task after changing the mappings to update your workspace.
55-
mappings = "stable_39"
56-
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
57-
58-
replace '@MINECRAFT-VERSION@', project.minecraft_version
59-
replace '@VERSION@', version
60-
}
61-
62-
configurations {
63-
all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
42+
mappings channel: 'snapshot', version: '20180921-1.13'
43+
runs {
44+
client = {
45+
workingDirectory project.file('run').canonicalPath
46+
source sourceSets.main
47+
}
48+
server = {
49+
workingDirectory project.file('run').canonicalPath
50+
}
51+
}
6452
}
6553

6654
repositories {
6755
mavenCentral()
6856
jcenter()
69-
maven { name = 'forgelin'; url = 'http://maven.shadowfacts.net' }
70-
maven { name='TCL'; url='https://maven.mcmoddev.com' }
7157
maven {
72-
// location of the maven that hosts JEI files
73-
name = "Progwml6 maven"
74-
url = "http://dvs1.progwml6.com/files/maven"
75-
}
76-
maven { url 'http://maven.covers1624.net/' }
77-
maven { // CraftTweaker
78-
name 'jared maven'
79-
url "http://maven.blamejared.com/"
80-
}
81-
maven {
82-
name = "CurseForge"
83-
url = "https://minecraft.curseforge.com/api/maven/"
58+
url 'https://hrznstudio.com/maven/snapshot'
8459
}
8560
}
8661

8762
dependencies {
88-
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.3-2"
89-
deobfCompile("net.ndrei:tesla-core-lib:${project.teslacorelib_mc_version}-${project.teslacorelib_version}") { changing = true }
90-
compileOnly "org.projectlombok:lombok:1.16.16"
91-
// compile against the JEI API
92-
deobfCompile "mezz.jei:jei_1.12.2:${project.jei_version}:api"
93-
// at runtime, use the full JEI jar
94-
runtime "mezz.jei:jei_1.12.2:${project.jei_version}"
95-
compile "cofh:RedstoneFlux:1.12-${project.redstoneflux_version}:universal"
96-
compileOnly "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.10.306"
97-
deobfCompile "baubles:Baubles:1.12:1.5.2"
98-
deobfCompile "moo-fluids:MooFluids:1.12.2:1.7.11.02a"
63+
minecraft 'net.minecraftforge.test:forge:1.13-24.0.59-1.13-pre'
64+
compile 'com.hrznstudio.titanium:Titanium:0.1.+'
65+
compileOnly 'org.projectlombok:lombok:1.16.16'
9966
}
10067

10168
processResources {
10269
// this will ensure that this task is redone when the versions change.
103-
inputs.property "version", project.mod_version
104-
inputs.property "mcversion", project.minecraft_version
70+
inputs.property 'version', project.version
71+
inputs.property 'mcversion', '1.13'
10572

10673
// replace stuff in mcmod.info, nothing else
10774
from(sourceSets.main.resources.srcDirs) {
108-
include 'mcmod.info'
75+
include 'META_INF/mods.toml'
10976

11077
// replace version and mcversion
111-
expand 'version': project.mod_version, 'mcversion': project.minecraft_version
78+
expand 'version':project.version, 'mcversion': '1.13'
11279
}
11380

11481
// copy everything else except the mcmod.info
11582
from(sourceSets.main.resources.srcDirs) {
116-
exclude 'mcmod.info'
117-
}
118-
}
119-
120-
task apiJar(type: Jar, dependsOn: 'classes') {
121-
classifier = 'api'
122-
from(sourceSets.main.output) {
123-
include 'com/buuz135/industrial/api/**'
124-
}
125-
}
126-
127-
task devJar(type: Jar, dependsOn: 'classes') {
128-
from(sourceSets.main.output) {
129-
include '**'
130-
}
131-
extension = 'jar'
132-
classifier = 'deobf'
133-
}
134-
135-
artifacts {
136-
archives devJar
137-
archives apiJar
138-
}
139-
140-
configurations {
141-
deployerJars
142-
}
143-
144-
dependencies {
145-
deployerJars "org.apache.maven.wagon:wagon-ftp:2.2"
146-
}
147-
148-
uploadArchives {
149-
if (project.hasProperty('username') && project.hasProperty('password')) {
150-
repositories {
151-
mavenDeployer {
152-
configuration = configurations.deployerJars
153-
//repository(url: System.properties['URL']) {
154-
repository(url: "ftp://dyonovan.com/srv/http/maven2") {
155-
authentication(userName: "${username}", password: "${password}")
156-
}
157-
pom {
158-
groupId = project.group
159-
version = project.version
160-
artifactId = project.archivesBaseName
161-
162-
pom.project {
163-
name = project.archivesBaseName
164-
packaging 'jar'
165-
description 'Industrial Foregoing'
166-
url 'https://github.com/Buuz135/Industrial-Foregoing'
167-
scm {
168-
url 'https://github.com/Buuz135/Industrial-Foregoing'
169-
connection 'scm:git:[email protected]/Buuz135/Industrial-Foregoing'
170-
developerConnection 'scm:git:[email protected]/Buuz135/Industrial-Foregoing'
171-
}
172-
issueManagement {
173-
system 'github'
174-
url 'https://github.com/Buuz135/Industrial-Foregoing/issues'
175-
}
176-
licenses {
177-
license {
178-
name 'MIT License'
179-
url 'https://opensource.org/licenses/MIT'
180-
distribution 'repo'
181-
}
182-
}
183-
developers {
184-
developer {
185-
id 'Buuz135'
186-
name 'Buuz135'
187-
roles {
188-
role 'developer'
189-
}
190-
}
191-
}
192-
}
193-
}
194-
}
195-
196-
}
197-
}
198-
}
199-
200-
changelog {
201-
title = "Industrial Foregoing"
202-
fileName = "CHANGELOG.md"
203-
outputDirectory = file("$projectDir")
204-
since = '1.10.6'
205-
commitFormat = '%s (%an)'
206-
markdown {
207-
commitFormat = '* %s (%an)'
208-
}
209-
includeLines = {
210-
!it.contains("Merge")
211-
}
212-
processLines = {
213-
String input = it as String
214-
if (input.contains('[ci skip] ')) {
215-
input = input.minus('[ci skip] ')
216-
}
217-
input
218-
}
219-
}
220-
221-
tasks.curseforge.enabled = project.hasProperty('curse_api')
222-
223-
curseforge {
224-
if (project.hasProperty('curse_api')) {
225-
apiKey = project.curse_api
226-
}
227-
project {
228-
id = '266515'
229-
changelog = file('CHANGELOG.md')
230-
changelogType = 'markdown'
231-
releaseType = 'beta'
232-
233-
mainArtifact(jar){
234-
relations {
235-
requiredLibrary 'tesla-core-lib'
236-
}
237-
}
238-
239-
addArtifact sourceJar
240-
addArtifact apiJar
241-
addArtifact devJar
242-
}
243-
}
244-
245-
license {
246-
header rootProject.file('HEADER')
247-
include "**/*.java"
248-
ext.year = Calendar.getInstance().get(Calendar.YEAR)
249-
ext.name = 'Buuz135'
250-
ignoreFailures = true
251-
mapping {
252-
java='SLASHSTAR_STYLE'
83+
exclude 'META_INF/mods.toml'
25384
}
25485
}

gradle/wrapper/gradle-wrapper.jar

2.09 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Apr 25 13:03:06 CEST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

0 commit comments

Comments
 (0)