Skip to content

Commit e61d646

Browse files
committed
Port Create to Minecraft 26.2
1 parent fdfde66 commit e61d646

5,552 files changed

Lines changed: 36790 additions & 39593 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
- name: Checkout Repository
1818
uses: actions/checkout@v4
1919

20-
- name: Setup Java 21
21-
run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV"
20+
- name: Setup Java 25
21+
run: echo "JAVA_HOME=$JAVA_HOME_25_X64" >> "$GITHUB_ENV"
2222

2323
- name: Setup Gradle
2424
uses: gradle/actions/setup-gradle@v4

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pipeline {
44
agent any
55

66
tools {
7-
jdk "jdk-21"
7+
jdk "jdk-25"
88
}
99

1010
stages {

build.gradle

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ String gitHash = calculateGitHash() + (hasUnstaged() ? "-modified" : "")
1515
group = "com.simibubi.create"
1616
version = mod_version + (dev && buildNumber != null ? "-${buildNumber}" : "")
1717

18-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
18+
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
19+
20+
tasks.withType(net.neoforged.nfrtgradle.NeoFormRuntimeTask).configureEach {
21+
javaExecutable.set(javaToolchains.launcherFor {
22+
languageVersion = JavaLanguageVersion.of(25)
23+
}.map { it.executablePath.asFile.absolutePath })
24+
}
1925

2026
println("Java: ${System.getProperty("java.version")}, JVM: ${System.getProperty("java.vm.version")} (${System.getProperty("java.vendor")}), Arch: ${System.getProperty("os.arch")}")
2127

@@ -75,7 +81,7 @@ neoForge {
7581
}
7682

7783
data {
78-
data()
84+
clientData()
7985

8086
programArguments.addAll(
8187
"--mod", mod_id as String,
@@ -92,6 +98,9 @@ neoForge {
9298
}
9399

94100
repositories {
101+
if (project.hasProperty("create.useMavenLocal")) {
102+
mavenLocal()
103+
}
95104
maven { url = "https://maven.createmod.net" } // Ponder, Flywheel
96105
maven { url = "https://maven.ithundxr.dev/snapshots" } // Registrate
97106
maven { url = "https://maven.blamejared.com" } // JEI, Vazkii's Mods
@@ -146,8 +155,10 @@ dependencies {
146155

147156
localImplementation("mezz.jei:jei-$minecraft_version-neoforge:$jei_version")
148157

149-
compileOnly("top.theillusivec4.curios:curios-neoforge:$curios_version+$minecraft_version:api")
150-
localRuntimeOnly("top.theillusivec4.curios:curios-neoforge:$curios_version+$minecraft_version")
158+
if (curios_enable.toBoolean()) {
159+
compileOnly("top.theillusivec4.curios:curios-neoforge:$curios_version:api")
160+
localRuntimeOnly("top.theillusivec4.curios:curios-neoforge:$curios_version")
161+
}
151162

152163
compileOnly("maven.modrinth:sodium:mc$minecraft_version-$sodium_version-neoforge")
153164

@@ -157,30 +168,53 @@ dependencies {
157168
localRuntimeOnly("cc.tweaked:cc-tweaked-$minecraft_version-forge:$cc_tweaked_version")
158169
}
159170

160-
compileOnly("maven.modrinth:farmers-delight:${farmers_delight_version}")
161171
if (farmers_delight_enable.toBoolean()) {
172+
compileOnly("maven.modrinth:farmers-delight:${farmers_delight_version}")
162173
localImplementation("maven.modrinth:farmers-delight:${farmers_delight_version}")
163174
}
164175

165-
localRuntimeOnly("dev.architectury:architectury-neoforge:13d.0.8")
166-
localImplementation("dev.ftb.mods:ftb-chunks-neoforge:2101.1.1")
167-
localImplementation("dev.ftb.mods:ftb-teams-neoforge:2101.1.0")
168-
localImplementation("dev.ftb.mods:ftb-library-neoforge:2101.1.3")
176+
if (ftb_enable.toBoolean()) {
177+
localRuntimeOnly("dev.architectury:architectury-neoforge:13d.0.8")
178+
localImplementation("dev.ftb.mods:ftb-chunks-neoforge:2101.1.1")
179+
localImplementation("dev.ftb.mods:ftb-teams-neoforge:2101.1.0")
180+
localImplementation("dev.ftb.mods:ftb-library-neoforge:2101.1.3")
181+
}
169182

170-
localImplementation("maven.modrinth:journeymap:1.21.1-6.0.0-beta.54+neoforge")
171-
localImplementation("info.journeymap:journeymap-api-neoforge:2.0.0-1.21.1-20260205.200232-15") {
172-
exclude(group: "curse.maven") // Pulls in a old version of journey map which is for forge
183+
if (journeymap_enable.toBoolean()) {
184+
localImplementation("maven.modrinth:journeymap:1.21.1-6.0.0-beta.54+neoforge")
185+
localImplementation("info.journeymap:journeymap-api-neoforge:2.0.0-1.21.1-20260205.200232-15") {
186+
exclude(group: "curse.maven") // Pulls in a old version of journey map which is for forge
187+
}
173188
}
174189

175-
compileOnly("xaero.lib:xaerolib-neoforge-1.21:1.0.42")
176-
compileOnly("curse.maven:xaeros-world-map-317780:7401095")
190+
if (xaero_enable.toBoolean()) {
191+
compileOnly("xaero.lib:xaerolib-neoforge-1.21:1.0.42")
192+
compileOnly("curse.maven:xaeros-world-map-317780:7401095")
193+
}
177194
}
178195

179196
sourceSets.main {
180197
java {
198+
if (!curios_enable.toBoolean()) {
199+
exclude("com/simibubi/create/compat/curios/**")
200+
}
181201
if (!cc_tweaked_enable.toBoolean()) {
182202
exclude("com/simibubi/create/compat/computercraft/implementation/**")
183203
}
204+
if (!farmers_delight_enable.toBoolean()) {
205+
exclude("com/simibubi/create/compat/farmersdelight/**")
206+
}
207+
if (!ftb_enable.toBoolean()) {
208+
exclude("com/simibubi/create/compat/ftb/**")
209+
exclude("com/simibubi/create/compat/trainmap/FTBChunksTrainMap.java")
210+
}
211+
if (!journeymap_enable.toBoolean()) {
212+
exclude("com/simibubi/create/compat/trainmap/JourneyTrainMap.java")
213+
}
214+
if (!xaero_enable.toBoolean()) {
215+
exclude("com/simibubi/create/compat/trainmap/XaeroTrainMap.java")
216+
exclude("com/simibubi/create/foundation/mixin/compat/xaeros/**")
217+
}
184218
}
185219

186220
resources {

gradle.properties

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.parallel = true
44
org.gradle.caching = true
55

66
# Mod Info
7-
mod_version = 6.0.11
8-
minecraft_version = 1.21.1
7+
mod_version = 6.1.0
8+
minecraft_version = 26.2
99

1010
mod_id = create
1111
mod_name = Create
@@ -15,48 +15,54 @@ mod_license = Read attached LICENSE.md
1515

1616
# NeoForge
1717
# https://neoforged.net/
18-
neo_version = 21.1.219
18+
neo_version = 26.2.0.8-beta
1919

2020
# Mappings
2121
# https://parchmentmc.org/docs/getting-started
2222
#
2323
# parchment_minecraft_version being set to "same" will use minecraft_version
2424
# parchment_version set to "none" will disable parchment mappings
2525
parchment_minecraft_version = same
26-
parchment_version = 2024.11.17
26+
parchment_version = none
2727

2828
# Registrate
29-
registrate_version = MC1.21-1.3.0+67
29+
registrate_version = MC26.2-1.6.0+2e4d67c
3030

3131
# Ponder
3232
# https://maven.createmod.net/net/createmod/ponder/
33-
ponder_version = 1.0.82
33+
ponder_version = 1.0.90
3434

3535
# Flywheel & Vanillin
3636
# https://maven.createmod.net/dev/engine-room/flywheel/
37-
flywheel_version = 1.0.6
37+
flywheel_version = 1.0.7
3838
flywheel_version_range = [1.0.0,2.0)
3939
# https://maven.createmod.net/dev/engine-room/vanillin/
40-
vanillin_version = 1.1.3-41
40+
vanillin_version = 1.1.4
4141

4242
# Just Enough Items
4343
# https://modrinth.com/mod/jei/versions
44-
jei_version = 19.21.0.247
44+
jei_version = 30.7.0.40
4545

4646
# Curios
4747
# https://modrinth.com/mod/curios/versions
48-
curios_version = 9.2.2
48+
curios_enable = false
49+
curios_version = 15.0.0-beta.2+26.1.2
4950

5051
# Sodium
5152
# https://modrinth.com/mod/sodium/versions
52-
sodium_version = 0.6.9
53+
sodium_version = 0.9.1-beta.4
5354

5455
# CC: Tweaked
5556
# https://modrinth.com/mod/cc-tweaked/versions
5657
cc_tweaked_enable = true
57-
cc_tweaked_version = 1.116.1
58+
cc_tweaked_version = 1.120.1
5859

5960
# Farmer's Delight
6061
# https://modrinth.com/mod/farmers-delight
61-
farmers_delight_enable = true
62+
farmers_delight_enable = false
6263
farmers_delight_version = 1.21.1-1.2.9
64+
65+
# Local development/runtime integrations waiting for official 26.2 artifacts
66+
ftb_enable = false
67+
journeymap_enable = false
68+
xaero_enable = false

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pluginManagement {
66
}
77
}
88

9-
if (file("Ponder").exists()) {
9+
if (providers.gradleProperty("create.useLocalPonderComposite").isPresent() && file("Ponder").exists()) {
1010
includeBuild(".")
1111
includeBuild("Ponder") {
1212
dependencySubstitution {

src/generated/resources/.cache/059f70d822f3fe46a7addb0bb70dc58ad8353903

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 1.21.1 2025-11-02T10:48:42.611425877 create's mechanical crafting recipes
2-
c525511634e4dcd29ff707cfea7c24570c4b8b9c data/create/recipe/mechanical_crafting/crushing_wheel.json
3-
26079bcc4010920b0b9e294103ad6bf40e0d04aa data/create/recipe/mechanical_crafting/extendo_grip.json
4-
b02bb2a27f3225d2993b9fa5f9369cdff19ea440 data/create/recipe/mechanical_crafting/potato_cannon.json
5-
ad748f351a175305d8a988ac7f8657f9dcc7918c data/create/recipe/mechanical_crafting/wand_of_symmetry.json
1+
// 26.2 2026-07-08T18:29:28.9128298 create's mechanical crafting recipes
2+
d4e712c345c100401633fe32f1fd6473f8395299 data/create/recipe/mechanical_crafting/crushing_wheel.json
3+
11961184ebb9ce66e75465a96508699aa4112cff data/create/recipe/mechanical_crafting/extendo_grip.json
4+
bf2c843a3f1c6d450965176925aa353f67aaadec data/create/recipe/mechanical_crafting/potato_cannon.json
5+
df3d63488c7f34e08e43384baf6e1d3394478bed data/create/recipe/mechanical_crafting/wand_of_symmetry.json

0 commit comments

Comments
 (0)