Skip to content

Commit b1500a4

Browse files
ROMVoid95ROMVoid95
committed
chore(buildscripts): update and bump
1 parent aafb53c commit b1500a4

File tree

8 files changed

+93
-283
lines changed

8 files changed

+93
-283
lines changed

‎.pomrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"name": "Galacticraft-Legacy",
3+
"url": "https://github.com/TeamGalacticraft/Galacticraft-Legacy",
4+
"description": "An advanced space exploration mod for Minecraft",
5+
"inceptionYear": "2021",
6+
"organization": {
7+
"name": "TeamGalacticraft",
8+
"url": "https://github.com/TeamGalacticraft"
9+
},
10+
"licenses": [
11+
{
12+
"name": "MIT",
13+
"url": "https://github.com/TeamGalacticraft/Galacticraft-Legacy/blob/master/LICENSE",
14+
"distribution": "repo"
15+
}
16+
],
17+
"issueManagement": {
18+
"system": "github",
19+
"url": "https://github.com/TeamGalacticraft/Galacticraft-Legacy/issues"
20+
},
21+
"scm": {
22+
"connection": "scm:git:git://github.com/TeamGalacticraft/Galacticraft-Legacy.git",
23+
"developerConnection": "scm:git:[email protected]:TeamGalacticraft/Galacticraft-Legacy.git",
24+
"url": "https://github.com/TeamGalacticraft/Galacticraft-Legacy"
25+
},
26+
"developers": [
27+
{
28+
"id": "rom",
29+
"name": "ROMVoid95",
30+
"email": "[email protected]",
31+
"roles": [
32+
"developer"
33+
],
34+
"timezone": "CST/CDT"
35+
}
36+
]
37+
}

‎build.gradle

Lines changed: 17 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -1,194 +1,51 @@
1-
buildscript {
2-
dependencies {
3-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
4-
}
5-
}
6-
71
plugins {
82
id 'java'
93
id 'eclipse'
104
id 'io.freefair.lombok' version '6.5.0.2'
11-
id 'wtf.gofancy.fancygradle' version '1.+'
125
id 'org.cadixdev.licenser' version '0.6.1'
6+
id 'net.galacticraft.internal.maven' version '1.0.0'
7+
id 'net.galacticraft.internal.legacy.defaults' version '1.0.0'
138
}
149

15-
apply plugin: 'net.minecraftforge.gradle'
1610
java.toolchain.languageVersion = JavaLanguageVersion.of(8)
1711

1812
group = "micdoodle8.mods.galacticraft"
1913
archivesBaseName = "Galacticraft"
2014

21-
version = '4.0.4-SNAPSHOT'
15+
version = "${mod_version}${version_suffix}"
2216

2317
repositories {
2418
mavenCentral()
2519
maven {
2620
name 'galacticraft'
27-
url 'https://maven.galacticraft.net/repository/legacy-common/'
28-
}
29-
maven {
30-
name 'buildcraft'
31-
url 'https://mod-buildcraft.com/maven/'
32-
content { includeGroup 'com.mod-buildcraft' }
33-
}
34-
maven {
35-
name 'ic2'
36-
url 'https://maven.ic2.player.to'
37-
content { includeGroup 'net.industrial-craft' }
38-
}
39-
maven {
40-
name 'prog'
41-
url 'https://dvs1.progwml6.com/files/maven'
42-
content { includeGroup 'mezz.jei' }
43-
}
44-
maven {
45-
name 'opencomputers'
46-
url 'https://maven.cil.li/'
47-
content { includeGroup 'li.cil.oc' }
48-
}
49-
maven {
50-
name 'BlameJared - Crafttweaker'
51-
url 'https://maven.blamejared.com/'
52-
content { includeGroup 'CraftTweaker2' }
53-
}
54-
maven {
55-
name 'cc-tweaked'
56-
url 'https://squiddev.cc/maven/'
57-
content { includeGroup 'org.squiddev' }
58-
}
59-
60-
all {
61-
ArtifactRepository repo ->
62-
if (repo instanceof MavenArtifactRepository) {
63-
if ((repo.url.toString() == 'files.minecraftforge.net') ||
64-
(repo.url.toString() == 'maven.minecraftforge.net')) {
65-
remove repo
66-
}
67-
}
21+
url 'https://maven.galacticraft.net/repository/legacy-common/'
6822
}
6923
}
7024

7125
configurations {
72-
compileOnly.extendsFrom compileMod
26+
compileOnly.extendsFrom compileRequire
7327
}
7428

7529
dependencies {
7630
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
77-
78-
compileMod fg.deobf('mod.dependency:biomes-o-plenty:7.0.1.2445')
79-
compileMod fg.deobf('mod.dependency:mekanism:9.8.3.390')
80-
compileMod fg.deobf('mod.dependency:appliedenergistics2:rv6-stable-7')
81-
compileMod fg.deobf('mod.dependency:redstoneflux:2.1.1.1')
82-
compileMod fg.deobf('mod.dependency:actuallyadditions:r152')
83-
compileMod fg.deobf('mod.dependency:playerapi:1.1')
84-
compileMod fg.deobf('mod.dependency:industrialcraft-2:2.8.222-ex112')
85-
compileMod fg.deobf('mod.dependency:journeymap:5.7.1')
86-
compileMod fg.deobf('mod.dependency:buildcraft-api:7.99.24.8')
87-
compileMod fg.deobf('mod.dependency:jei:4.16.1.302:api')
88-
runtimeOnly fg.deobf('mod.dependency:jei:4.16.1.302')
89-
}
90-
91-
minecraft {
92-
mappings channel: "${mapping_channel}", version: "${mapping_version}"
9331

94-
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
95-
96-
runs {
97-
client {
98-
workingDirectory project.file('run')
99-
property 'forge.logging.markers', 'REGISTRIES'
100-
property 'forge.logging.console.level', 'debug'
101-
if (project.hasProperty('uuid'))
102-
args '--uuid', project.getProperty('uuid')
103-
if (project.hasProperty('username'))
104-
args '--username', project.getProperty('username')
105-
jvmArg '-Dfml.coreMods.load=micdoodle8.mods.miccore.MicdoodlePlugin'
106-
}
107-
server {
108-
workingDirectory project.file('run')
109-
property 'forge.logging.markers', 'REGISTRIES'
110-
property 'forge.logging.console.level', 'debug'
111-
jvmArg '-Dfml.coreMods.load=micdoodle8.mods.miccore.MicdoodlePlugin'
112-
}
113-
}
114-
}
115-
116-
fancyGradle {
117-
patches {
118-
resources
119-
coremods
120-
asm
121-
}
122-
}
123-
124-
def setManifest = { Manifest manifest->
125-
manifest.attributes(
126-
[
127-
'Specification-Title' : 'Galacticraft',
128-
'Specification-Vendor' : 'TeamGalacticraft',
129-
'Specification-Version' : "${version}",
130-
'Implementation-Title' : 'Galacticraft',
131-
'Implementation-Version' : "${version}",
132-
'Implementation-Vendor' : 'TeamGalacticraft',
133-
'Implementation-Build-Date' : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
134-
'FMLAT' : 'accesstransformer.cfg',
135-
'FMLCorePluginContainsFMLMod' : 'true',
136-
'FMLCorePlugin' : 'micdoodle8.mods.miccore.MicdoodlePlugin',
137-
'Built-On-Minecraft' : "${mc_version}",
138-
'Built-On-Forge' : "${forge_version}",
139-
'Built-On-Mapping' : "${mapping_channel}-${mapping_version}",
140-
'Built-Using' : "ForgeGradle: 5.1.+"
141-
] as LinkedHashMap
142-
)
143-
}
144-
145-
jar {
146-
manifest(setManifest)
147-
archiveVersion.set("${mc_version}-${version}")
148-
}
149-
150-
jar.finalizedBy('reobfJar')
151-
152-
task sourcesJar(type: Jar, dependsOn: classes) {
153-
duplicatesStrategy(DuplicatesStrategy.FAIL)
154-
archiveClassifier.set('sources')
155-
archiveVersion.set("${mc_version}-${version}")
156-
from sourceSets.main.allSource
157-
}
158-
159-
task deobfJar(type: Jar) {
160-
duplicatesStrategy(DuplicatesStrategy.FAIL)
161-
archiveClassifier.set('deobf')
162-
archiveVersion.set("${mc_version}-${version}")
163-
from sourceSets.main.output
164-
from sourceSets.main.allJava
165-
manifest(setManifest)
166-
}
167-
168-
task mavenJar(type: Jar) {
169-
duplicatesStrategy(DuplicatesStrategy.INCLUDE)
170-
manifest(setManifest)
171-
archiveVersion.set("${mc_version}-${version}-maven")
172-
from(sourceSets.main.output) {
173-
exclude 'micdoodle8/mods/miccore/IntCache.*'
174-
}
175-
from("${projectDir}/etc/replace") {
176-
include 'IntCache.class'
177-
into 'micdoodle8/mods/miccore'
178-
}
179-
}
180-
181-
artifacts {
182-
archives deobfJar
183-
archives sourcesJar
184-
archives mavenJar
32+
compileRequire fg.deobf('mod.dependency:mekanism:9.8.3.390')
33+
compileRequire fg.deobf('mod.dependency:industrialcraft-2:2.8.222-ex112')
34+
compileRequire fg.deobf('mod.dependency:buildcraft-api:7.99.24.8')
35+
compileOnly fg.deobf('mod.dependency:biomes-o-plenty:7.0.1.2445')
36+
compileOnly fg.deobf('mod.dependency:appliedenergistics2:rv6-stable-7')
37+
compileOnly fg.deobf('mod.dependency:redstoneflux:2.1.1.1')
38+
compileOnly fg.deobf('mod.dependency:actuallyadditions:r152')
39+
compileOnly fg.deobf('mod.dependency:playerapi:1.1')
40+
compileOnly fg.deobf('mod.dependency:journeymap:5.7.1')
41+
compileOnly fg.deobf('mod.dependency:jei:4.16.1.302:api')
42+
runtimeOnly fg.deobf('mod.dependency:jei:4.16.1.302')
18543
}
18644

187-
apply from: 'gradle/maven.gradle'
18845
apply from: 'gradle/resources.gradle'
18946

19047
license {
191-
header = project.file('etc/license/HEADER')
48+
header = project.file('etc/HEADER')
19249
properties {
19350
company = 'Team Galacticraft'
19451
year = Calendar.getInstance().get(Calendar.YEAR);

‎etc/license/HEADER renamed to ‎etc/HEADER

File renamed without changes.

‎OLD_LICENSE.txt renamed to ‎etc/OLD_LICENSE.txt

File renamed without changes.

‎gradle.properties

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
org.gradle.daemon=false
22

3-
mc_version = 1.12.2
4-
forge_version = 14.23.5.2860
5-
mapping_channel = stable
6-
mapping_version = 39-1.12
3+
internal.maven.sign=false
4+
5+
mc_version=1.12.2
6+
forge_version=14.23.5.2860
7+
mapping_channel=stable
8+
mapping_version=39-1.12
9+
10+
mod_version=4.0.4
11+
version_suffix=
712

813
##Allows using your skin while testing, This can be with or without hyphens
9-
##uuid =
10-
##username =
11-
##accessToken =
14+
##uuid =
15+
##username =
16+
##accessToken =

‎gradle/maven.gradle

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎settings.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
pluginManagement {
22
repositories {
33
maven {
4-
url = 'https://maven.galacticraft.net/repository/common-proxy/'
5-
}
6-
maven {
7-
url = 'https://repo.galacticraft.net/repository/maven-common/'
4+
url = 'https://maven.galacticraft.net/repository/gradle/'
85
}
96
}
107
}

0 commit comments

Comments
 (0)