Skip to content

Commit c60b954

Browse files
PT400CPT400C
authored
Merge pull request #6 from Jomcraft-Network/dev
Add support for NeoForge 1.21.9
2 parents 9d9dc42 + ba51540 commit c60b954

15 files changed

Lines changed: 243 additions & 27 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v2
11-
- name: Set up JDK 17
12-
uses: actions/setup-java@v2
10+
- uses: actions/checkout@v5
11+
- name: Set up JDK 21
12+
uses: actions/setup-java@v5
1313
with:
14-
java-version: '17'
14+
java-version: |
15+
8
16+
16
17+
21
1518
distribution: 'adopt'
1619
cache: gradle
1720
- name: Grant execute permission for gradlew
1821
run: chmod +x gradlew
1922
- name: Validate Gradle wrapper
20-
uses: gradle/wrapper-validation-action@v1
23+
uses: gradle/actions/wrapper-validation@v3
2124
- name: Build with Gradle
2225
run: ./gradlew build copyRelease
23-
- uses: actions/upload-artifact@v2
26+
- uses: actions/upload-artifact@v4
2427
with:
2528
name: 'Prebuilt Artifacts'
2629
path: build/libs

‎.github/workflows/publish.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,20 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v2
22-
- name: Set up JDK 17
23-
uses: actions/setup-java@v2
21+
- uses: actions/checkout@v5
22+
- name: Set up JDK 21
23+
uses: actions/setup-java@v5
2424
with:
25-
java-version: '17'
25+
java-version: |
26+
8
27+
16
28+
21
2629
distribution: 'adopt'
2730
cache: gradle
2831
- name: Grant execute permission for gradlew
2932
run: chmod +x gradlew
3033
- name: Validate Gradle wrapper
31-
uses: gradle/wrapper-validation-action@v1
34+
uses: gradle/actions/wrapper-validation@v3
3235
- name: Build with Gradle and publish all editions
3336
if: ${{ github.event.inputs.publish-all == 'true' }}
3437
run: ./gradlew build publishCurseForge copyRelease
@@ -39,7 +42,7 @@ jobs:
3942
run: ./gradlew :${{ github.event.inputs.publish-edition }}:build :${{ github.event.inputs.publish-edition }}:publishCurseForge :${{ github.event.inputs.publish-edition }}:copyRelease
4043
env:
4144
CURSE_API: ${{ secrets.CURSE_API }}
42-
- uses: actions/upload-artifact@v2
45+
- uses: actions/upload-artifact@v4
4346
with:
4447
name: 'Prebuilt Artifacts'
4548
path: build/libs

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎settings.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pluginManagement {
88
maven {
99
url = 'https://repo.spongepowered.org/repository/maven-public/'
1010
}
11+
maven { url = 'https://maven.neoforged.net/releases' }
1112
}
1213
}
1314

@@ -24,6 +25,9 @@ project(":Forge-1.16.5").projectDir = file("./sources/Forge-1.16.5")
2425
include("Forge-1.17.1")
2526
project(":Forge-1.17.1").projectDir = file("./sources/Forge-1.17.1")
2627

28+
include("NeoForge-1.21.9")
29+
project(":NeoForge-1.21.9").projectDir = file("./sources/NeoForge-1.21.9")
30+
2731
include("Forge-1.12.2")
2832
project(":Forge-1.12.2").projectDir = file("./sources/Forge-1.12.2")
2933

‎sources/Fabric-1.16.5/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ loom {
5454

5555
task sourcesJar(type: Jar) {
5656
from sourceSets.main.allSource
57-
classifier = 'sources'
57+
archiveClassifier = 'sources'
5858
}
5959

6060
artifacts {
@@ -100,7 +100,7 @@ task("copyRelease") {
100100
def libDir = project.projectDir.toPath().resolve("build/libs")
101101
from(libDir) {
102102
include "*.jar"
103-
exclude "*-dev.jar", "*-sources.jar"
103+
exclude "*-dev.jar"
104104
}
105105
into "../../build/libs/"
106106
duplicatesStrategy DuplicatesStrategy.INCLUDE

‎sources/Forge-1.12.2/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
7+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
88
}
99
}
1010

@@ -88,7 +88,7 @@ tasks.withType(JavaCompile) {
8888

8989
task sourcesJar(type: Jar) {
9090
from sourceSets.main.allSource
91-
classifier = 'sources'
91+
archiveClassifier = 'sources'
9292
}
9393

9494
artifacts {
@@ -125,7 +125,7 @@ task("copyRelease") {
125125
def libDir = project.projectDir.toPath().resolve("build/libs")
126126
from(libDir) {
127127
include "*.jar"
128-
exclude "*-dev.jar", "*-sources.jar"
128+
exclude "*-dev.jar"
129129
}
130130
into "../../build/libs/"
131131
duplicatesStrategy DuplicatesStrategy.INCLUDE

‎sources/Forge-1.16.5/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
8+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
99
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
1010
}
1111
}
@@ -107,7 +107,7 @@ tasks.withType(JavaCompile) {
107107

108108
task sourcesJar(type: Jar) {
109109
from sourceSets.main.allSource
110-
classifier = 'sources'
110+
archiveClassifier = 'sources'
111111
}
112112

113113
artifacts {
@@ -144,7 +144,7 @@ task("copyRelease") {
144144
def libDir = project.projectDir.toPath().resolve("build/libs")
145145
from(libDir) {
146146
include "*.jar"
147-
exclude "*-dev.jar", "*-sources.jar"
147+
exclude "*-dev.jar"
148148
}
149149
into "../../build/libs/"
150150
duplicatesStrategy DuplicatesStrategy.INCLUDE

‎sources/Forge-1.17.1/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
7+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
88
}
99
}
1010

@@ -79,7 +79,7 @@ tasks.withType(JavaCompile) {
7979

8080
task sourcesJar(type: Jar) {
8181
from sourceSets.main.allSource
82-
classifier = 'sources'
82+
archiveClassifier = 'sources'
8383
}
8484

8585
artifacts {
@@ -122,7 +122,7 @@ task("copyRelease") {
122122
def libDir = project.projectDir.toPath().resolve("build/libs")
123123
from(libDir) {
124124
include "*.jar"
125-
exclude "*-dev.jar", "*-sources.jar"
125+
exclude "*-dev.jar"
126126
}
127127
into "../../build/libs/"
128128
duplicatesStrategy DuplicatesStrategy.INCLUDE

‎sources/Forge-1.7.10/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
7+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
88
}
99
}
1010

@@ -90,7 +90,7 @@ tasks.withType(JavaCompile) {
9090
task sourcesJar(type: Jar) {
9191
exclude('cpw/**')
9292
from sourceSets.main.allSource
93-
classifier = 'sources'
93+
archiveClassifier = 'sources'
9494
}
9595

9696
artifacts {
@@ -127,7 +127,7 @@ task("copyRelease") {
127127
def libDir = project.projectDir.toPath().resolve("build/libs")
128128
from(libDir) {
129129
include "*.jar"
130-
exclude "*-dev.jar", "*-sources.jar"
130+
exclude "*-dev.jar"
131131
}
132132
into "../../build/libs/"
133133
duplicatesStrategy DuplicatesStrategy.INCLUDE

‎sources/NeoForge-1.21.9/build.gradle‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
plugins {
2+
id 'java-library'
3+
id 'net.darkhax.curseforgegradle' version '1.0.11'
4+
id 'net.neoforged.gradle.userdev' version '7.0.192'
5+
}
6+
7+
8+
archivesBaseName = "${rootProject.name}"
9+
10+
//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
11+
12+
ext.replace_version(version)
13+
14+
version = "1.21.9-${version}-NeoForge"
15+
16+
runs {
17+
client {
18+
workingDirectory file('./run')
19+
systemProperty 'forge.logging.markers', 'REGISTRIES'
20+
systemProperty 'forge.logging.console.level', 'debug'
21+
22+
modSource project.sourceSets.main
23+
modSource project(":Core").sourceSets.main
24+
}
25+
26+
server {
27+
workingDirectory file('./run')
28+
systemProperty 'forge.logging.markers', 'REGISTRIES'
29+
systemProperty 'forge.logging.console.level', 'debug'
30+
31+
modSource project.sourceSets.main
32+
modSource project(":Core").sourceSets.main
33+
}
34+
}
35+
36+
dependencies {
37+
implementation "net.neoforged:neoforge:21.9.14-beta"
38+
implementation project(":Core")
39+
}
40+
41+
/*processResources {
42+
duplicatesStrategy = 'include'
43+
44+
from(sourceSets.main.resources.srcDirs) {
45+
include 'META-INF/mods.toml'
46+
47+
// expand 'forge_version': forge_version
48+
}
49+
50+
from(sourceSets.main.resources.srcDirs) {
51+
exclude 'META-INF/mods.toml'
52+
}
53+
}*/
54+
55+
tasks.withType(JavaCompile) {
56+
source(project(":Core").sourceSets.main.allSource)
57+
}
58+
59+
task sourcesJar(type: Jar) {
60+
from sourceSets.main.allSource
61+
archiveClassifier = 'sources'
62+
}
63+
64+
idea {
65+
module {
66+
downloadSources = true
67+
downloadJavadoc = true
68+
}
69+
}
70+
71+
artifacts {
72+
archives jar
73+
archives sourcesJar
74+
}
75+
76+
task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
77+
if (System.getenv("CURSE_API") != null && !System.getenv("CURSE_API").equals("")) {
78+
disableVersionDetection()
79+
apiToken = System.getenv("CURSE_API")
80+
81+
def mainFile = upload(659192, jar)
82+
mainFile.releaseType = project.ext.relType
83+
mainFile.displayName = "$archivesBaseName-$version"
84+
mainFile.changelogType = 'html'
85+
mainFile.changelog = file('../../changelog.html')
86+
mainFile.addModLoader('Forge')
87+
mainFile.addJavaVersion('Java 16')
88+
mainFile.addJavaVersion('Java 17')
89+
mainFile.addGameVersion('1.20')
90+
mainFile.addGameVersion('1.19.4')
91+
mainFile.addGameVersion('1.19.3')
92+
mainFile.addGameVersion('1.19.2')
93+
mainFile.addGameVersion('1.18.2')
94+
mainFile.addGameVersion('1.17.1')
95+
96+
def sourcesFile = mainFile.withAdditionalFile(sourcesJar)
97+
sourcesFile.changelog = file('../../changelog.html')
98+
sourcesFile.displayName = "$archivesBaseName-$version-sources"
99+
}
100+
}
101+
102+
task("copyRelease") {
103+
dependsOn "build"
104+
105+
doFirst {
106+
println "Gathering builds"
107+
copy {
108+
def libDir = project.projectDir.toPath().resolve("build/libs")
109+
from(libDir) {
110+
include "*.jar"
111+
exclude "*-dev.jar"
112+
}
113+
into "../../build/libs/"
114+
duplicatesStrategy DuplicatesStrategy.INCLUDE
115+
}
116+
}
117+
}

0 commit comments

Comments
 (0)