Skip to content

Commit 251b33a

Browse files
cakeGitcakeGit
committed
Gradle -> neoforge
1 parent 548f735 commit 251b33a

7 files changed

+120
-121
lines changed

‎build.gradle

+81-79
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.yaml.snakeyaml.Yaml
2-
31
buildscript {
42
repositories {
53
mavenCentral()
@@ -33,6 +31,7 @@ subprojects {
3331
maven { url = "https://maven.blamejared.com/" } // JEI
3432
maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
3533
maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
34+
maven { url "https://maven.neoforged.net/releases/" }
3635
maven { // Flywheel
3736
url = "https://maven.tterrag.com/"
3837
content {
@@ -44,12 +43,13 @@ subprojects {
4443

4544
dependencies {
4645
minecraft "com.mojang:minecraft:${minecraft_version}"
47-
// layered mappings - Mojmap names, parchment and QM docs and parameters
48-
mappings(loom.layered {
49-
it.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${qm_version}:intermediary-v2")
50-
it.parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
51-
it.officialMojangMappings { nameSyntheticMembers = false }
52-
})
46+
// // layered mappings - Mojmap names, parchment and QM docs and parameters
47+
// mappings(loom.layered {
48+
// it.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${qm_version}:intermediary-v2")
49+
// it.parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
50+
// it.officialMojangMappings { nameSyntheticMembers = false }
51+
// })
52+
mappings loom.officialMojangMappings()
5353

5454
// see each subproject for dependencies.
5555
}
@@ -91,88 +91,90 @@ allprojects {
9191
}
9292

9393

94-
publishMods {
95-
def TOKENS = new HashMap<String, String>();
96-
def envFile = file("$projectDir/.env");
97-
98-
if (envFile.exists())
99-
envFile.readLines().each() {
100-
def (key, value) = it.tokenize('=')
101-
TOKENS.put(key, value)
102-
}
103-
104-
def cfg = new Yaml().load(new File("$projectDir/changelog.yaml").newInputStream())
105-
def changelogText = cfg[minecraft_version + "-" + mod_version];
106-
println("Found Changelog: \n" + changelogText)
107-
108-
def forgeName = "Create: Pattern Schematics $mod_version Forge $minecraft_version";
109-
def fabricName = "Create: Pattern Schematics $mod_version Fabric $minecraft_version";
110-
111-
def forgeFile = project(":forge").tasks.named("remapJar").get().archiveFile;
112-
// def fabricFile = project(":fabric").tasks.named("remapJar").get().archiveFile;
113-
114-
def forgeEmoji = "<:forge:1267784983771222088>";
115-
def fabricEmoji = "<:fabric:1267785013936783421>";
116-
def newVersionPing = "<@&1267779725040947243>";
117-
118-
changelog = "Changelog: \n" + changelogText
119-
type = STABLE
120-
121-
curseforge("forgeCF") {
122-
file = forgeFile
123-
displayName = forgeName
124-
projectId = "1072349"
125-
projectSlug = "create-pattern-schematics" // Required for discord webhook
126-
accessToken = TOKENS.get("CURSEFORGE_PUBLISH_TOKEN")
127-
minecraftVersions.add(minecraft_version)
128-
announcementTitle = "Curseforge download for $forgeEmoji"
129-
modLoaders.add("forge")
130-
131-
javaVersions.add(JavaVersion.VERSION_17)
132-
clientRequired = true
133-
serverRequired = true
134-
requires("create")
135-
}
136-
modrinth("forgeMR") {
137-
file = forgeFile
138-
displayName = forgeName
139-
projectId = "cpqKG67r"
140-
accessToken = TOKENS.get("MODRINTH_PUBLISH_TOKEN")
141-
minecraftVersions.add(minecraft_version)
142-
announcementTitle = "Modrinth download for $forgeEmoji"
143-
modLoaders.add("forge")
144-
requires("create")
145-
}
94+
//publishMods {
95+
// def TOKENS = new HashMap<String, String>();
96+
// def envFile = file("$projectDir/.env");
97+
//
98+
// if (envFile.exists())
99+
// envFile.readLines().each() {
100+
// def (key, value) = it.tokenize('=')
101+
// TOKENS.put(key, value)
102+
// }
103+
//
104+
// dryRun = true;//TODO -> neoforge
146105

147-
// curseforge("fabricCF") {
148-
// file = fabricFile
149-
// displayName = fabricName
106+
// def cfg = new Yaml().load(new File("$projectDir/changelog.yaml").newInputStream())
107+
// def changelogText = cfg[minecraft_version + "-" + mod_version];
108+
// println("Found Changelog: \n" + changelogText)
109+
//
110+
// def forgeName = "Create: Pattern Schematics $mod_version Forge $minecraft_version";
111+
// def fabricName = "Create: Pattern Schematics $mod_version Fabric $minecraft_version";
112+
//
113+
// def forgeFile = project(":forge").tasks.named("remapJar").get().archiveFile;
114+
//// def fabricFile = project(":fabric").tasks.named("remapJar").get().archiveFile;
115+
//
116+
// def forgeEmoji = "<:forge:1267784983771222088>";
117+
// def fabricEmoji = "<:fabric:1267785013936783421>";
118+
// def newVersionPing = "<@&1267779725040947243>";
119+
//
120+
// changelog = "Changelog: \n" + changelogText
121+
// type = STABLE
122+
//
123+
// curseforge("forgeCF") {
124+
// file = forgeFile
125+
// displayName = forgeName
150126
// projectId = "1072349"
151127
// projectSlug = "create-pattern-schematics" // Required for discord webhook
152128
// accessToken = TOKENS.get("CURSEFORGE_PUBLISH_TOKEN")
153129
// minecraftVersions.add(minecraft_version)
154-
// announcementTitle = "Curseforge download for $fabricEmoji"
155-
// modLoaders.add("fabric")
130+
// announcementTitle = "Curseforge download for $forgeEmoji"
131+
// modLoaders.add("forge")
156132
//
157133
// javaVersions.add(JavaVersion.VERSION_17)
158134
// clientRequired = true
159135
// serverRequired = true
160-
// requires("create-fabric", "fabric-api")
136+
// requires("create")
161137
// }
162-
// modrinth("fabricMR") {
163-
// file = fabricFile
164-
// displayName = fabricName
138+
// modrinth("forgeMR") {
139+
// file = forgeFile
140+
// displayName = forgeName
165141
// projectId = "cpqKG67r"
166142
// accessToken = TOKENS.get("MODRINTH_PUBLISH_TOKEN")
167143
// minecraftVersions.add(minecraft_version)
168-
// announcementTitle = "Modrinth download for $fabricEmoji"
169-
// modLoaders.add("fabric")
170-
// requires("create-fabric", "fabric-api")
144+
// announcementTitle = "Modrinth download for $forgeEmoji"
145+
// modLoaders.add("forge")
146+
// requires("create")
171147
// }
172-
173-
discord("discordUniversal") {
174-
webhookUrl = TOKENS.get("DISCORD_WEBHOOK")
175-
username = "New Version Announcement | Create: Pattern Schematics"
176-
content = "\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($fabricEmoji / $forgeEmoji)\n " + changelogText
177-
}
178-
}
148+
//
149+
//// curseforge("fabricCF") {
150+
//// file = fabricFile
151+
//// displayName = fabricName
152+
//// projectId = "1072349"
153+
//// projectSlug = "create-pattern-schematics" // Required for discord webhook
154+
//// accessToken = TOKENS.get("CURSEFORGE_PUBLISH_TOKEN")
155+
//// minecraftVersions.add(minecraft_version)
156+
//// announcementTitle = "Curseforge download for $fabricEmoji"
157+
//// modLoaders.add("fabric")
158+
////
159+
//// javaVersions.add(JavaVersion.VERSION_17)
160+
//// clientRequired = true
161+
//// serverRequired = true
162+
//// requires("create-fabric", "fabric-api")
163+
//// }
164+
//// modrinth("fabricMR") {
165+
//// file = fabricFile
166+
//// displayName = fabricName
167+
//// projectId = "cpqKG67r"
168+
//// accessToken = TOKENS.get("MODRINTH_PUBLISH_TOKEN")
169+
//// minecraftVersions.add(minecraft_version)
170+
//// announcementTitle = "Modrinth download for $fabricEmoji"
171+
//// modLoaders.add("fabric")
172+
//// requires("create-fabric", "fabric-api")
173+
//// }
174+
//
175+
// discord("discordUniversal") {
176+
// webhookUrl = TOKENS.get("DISCORD_WEBHOOK")
177+
// username = "New Version Announcement | Create: Pattern Schematics"
178+
// content = "\n# Create: Pattern Schematics has been updated to $mod_version for $minecraft_version ($fabricEmoji / $forgeEmoji)\n " + changelogText
179+
// }
180+
//}

‎common/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
architectury {
22
common(rootProject.enabled_platforms.split(","))
33
platformSetupLoomIde()
4-
forge()
4+
neoForge()
55
}
66

77
loom {
88
accessWidenerPath = file("src/main/resources/pattern_schematics.accesswidener")
9-
forge {}
109
}
1110

1211
repositories {
@@ -22,10 +21,11 @@ repositories {
2221
maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
2322
maven { url = "https://maven.tterrag.com" } // Registrate
2423
maven { url = "https://repo.spongepowered.org/maven/" } // Mixin
24+
maven { url "https://maven.neoforged.net/releases/" }
2525
}
2626

2727
dependencies {
28-
forge("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
28+
neoForge("net.neoforged:neoforge:${neoforge_version}")
2929
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
3030
// Do NOT use other classes from fabric loader
3131
// modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
@@ -40,9 +40,11 @@ dependencies {
4040
// Create and its dependencies
4141
implementation 'org.spongepowered:mixin:0.8.7'
4242
compileOnly('com.google.code.findbugs:jsr305:3.0.2')
43+
44+
// Create and its dependencies
4345
modCompileOnly("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
44-
modCompileOnly("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
45-
modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
46+
modCompileOnly("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
47+
modCompileOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
4648
modCompileOnly("com.tterrag.registrate:Registrate:${registrate_version}")
4749
}
4850

‎common/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
loom.platform=forge
1+
loom.platform=neoforge

‎forge/build.gradle

+16-21
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ plugins {
44

55
architectury {
66
platformSetupLoomIde()
7-
forge()
7+
neoForge()
88
}
99

1010
loom {
1111
accessWidenerPath = project(":common").loom.accessWidenerPath
1212

13-
forge {
14-
convertAccessWideners = true
15-
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
16-
}
13+
// neoForge {
14+
// convertAccessWideners = true
15+
// extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
16+
// }
1717
}
1818

1919
configurations {
@@ -36,20 +36,24 @@ repositories {
3636
}
3737
maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
3838
maven { url = "https://maven.tterrag.com" } // Registrate
39+
40+
maven { url "https://maven.neoforged.net/releases/" }
41+
maven { url = "https://mvn.devos.one/snapshots" } // Registrate
3942
maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort
4043
}
4144

4245
dependencies {
43-
forge("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
46+
neoForge("net.neoforged:neoforge:${neoforge_version}")
4447
common(project(path: ":common", configuration: "namedElements")) { transitive = false }
4548
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
4649

4750
// Create and its dependencies
48-
modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
49-
modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
50-
modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
51-
modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
52-
modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
51+
implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
52+
implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
53+
compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}")
54+
runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
55+
implementation("com.tterrag.registrate:Registrate:${registrate_version}")
56+
5357
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
5458
implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
5559

@@ -64,7 +68,7 @@ processResources {
6468
// set up properties for filling into metadata
6569
Map<String, String> properties = Map.of(
6670
"version", version,
67-
"forge_version", forge_version.split("\\.")[0], // only specify major version of forge
71+
"neoforge_version", neoforge_version.split("\\.")[0], // only specify major version of forge
6872
"minecraft_version", minecraft_version,
6973
"create_version", create_version.split("-")[0] // cut off build number
7074
)
@@ -75,15 +79,6 @@ processResources {
7579
}
7680
}
7781

78-
loom {
79-
forge {
80-
mixinConfig(
81-
"pattern_schematics.common.mixins.json",
82-
"pattern_schematics.mixins.json"
83-
)
84-
}
85-
}
86-
8782
shadowJar {
8883
exclude "fabric.mod.json"
8984
exclude "architectury.common.json"

‎forge/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
loom.platform=forge
1+
loom.platform=neoforge

‎gradle.properties

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,41 @@ archives_base_name = pattern_schematics
55
mod_version = 1.2.0
66
maven_group = com.cak.pattern_schematics
77

8-
minecraft_version = 1.20.1
9-
enabled_platforms = fabric,forge
8+
minecraft_version = 1.21.1
9+
#enabled_platforms = fabric,neoforge
10+
enabled_platforms = neoforge
1011

1112
# Mappings
1213
# https://lambdaurora.dev/tools/import_quilt.html
13-
qm_version = 23
14+
qm_version = 9
1415
# https://parchmentmc.org/docs/getting-started
15-
parchment_version = 2023.09.03
16+
parchment_version = 2024.11.17
1617

1718
# Fabric
1819
# https://fabricmc.net/develop/
1920
fabric_loader_version = 0.15.7
2021
fabric_api_version = 0.92.0+1.20.1
2122

22-
# Forge
23-
# https://files.minecraftforge.net/net/minecraftforge/forge/
24-
forge_version = 47.3.0
23+
# Neoforge
24+
neoforge_version = 21.1.128
2525

2626
# Create - Fabric - Not active
2727
# https://modrinth.com/mod/create-fabric/versions
2828
create_fabric_version =0.5.1-f-build.1417+mc1.20.1
2929

30-
# Create - Forge
30+
# Create - NeoForge
3131
# https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create
32-
create_version = 6.0.1-20
33-
ponder_version = 1.0.36
34-
flywheel_version = 1.0.1
35-
registrate_version = MC1.20-1.3.3
32+
create_version = 6.0.1-15
33+
ponder_version = 1.0.39
34+
flywheel_version = 1.0.1-11
35+
registrate_version = MC1.21-1.3.0+62
3636

3737
# Development QOL
3838
# Create Fabric supports all 3 recipe viewers: JEI, REI, and EMI. This decides which is enabled at runtime.
3939
# set to disabled to have none of them.
4040
fabric_recipe_viewer = JEI
4141
# JEI - https://www.curseforge.com/minecraft/mc-mods/jei/files/all
42-
jei_version = 15.19.0.85
42+
jei_version = 19.21.0.247
4343
# REI - https://modrinth.com/mod/rei/versions
4444
rei_version = 12.0.684
4545
# EMI - https://modrinth.com/mod/emi/versions

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010

1111
include("common")
12-
include("fabric")
12+
//include("fabric")
1313
include("forge")
1414

1515
rootProject.name = "pattern_schematics"

0 commit comments

Comments
 (0)