Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

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

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pipeline {
agent any

tools {
jdk "jdk-21"
jdk "jdk-25"
}

stages {
Expand Down
62 changes: 48 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ String gitHash = calculateGitHash() + (hasUnstaged() ? "-modified" : "")
group = "com.simibubi.create"
version = mod_version + (dev && buildNumber != null ? "-${buildNumber}" : "")

java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.toolchain.languageVersion = JavaLanguageVersion.of(25)

tasks.withType(net.neoforged.nfrtgradle.NeoFormRuntimeTask).configureEach {
javaExecutable.set(javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(25)
}.map { it.executablePath.asFile.absolutePath })
}

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

Expand Down Expand Up @@ -75,7 +81,7 @@ neoForge {
}

data {
data()
clientData()

programArguments.addAll(
"--mod", mod_id as String,
Expand All @@ -92,6 +98,9 @@ neoForge {
}

repositories {
if (project.hasProperty("create.useMavenLocal")) {
mavenLocal()
}
maven { url = "https://maven.createmod.net" } // Ponder, Flywheel
maven { url = "https://maven.ithundxr.dev/snapshots" } // Registrate
maven { url = "https://maven.blamejared.com" } // JEI, Vazkii's Mods
Expand Down Expand Up @@ -146,8 +155,10 @@ dependencies {

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

compileOnly("top.theillusivec4.curios:curios-neoforge:$curios_version+$minecraft_version:api")
localRuntimeOnly("top.theillusivec4.curios:curios-neoforge:$curios_version+$minecraft_version")
if (curios_enable.toBoolean()) {
compileOnly("top.theillusivec4.curios:curios-neoforge:$curios_version:api")
localRuntimeOnly("top.theillusivec4.curios:curios-neoforge:$curios_version")
}

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

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

compileOnly("maven.modrinth:farmers-delight:${farmers_delight_version}")
if (farmers_delight_enable.toBoolean()) {
compileOnly("maven.modrinth:farmers-delight:${farmers_delight_version}")
localImplementation("maven.modrinth:farmers-delight:${farmers_delight_version}")
}

localRuntimeOnly("dev.architectury:architectury-neoforge:13d.0.8")
localImplementation("dev.ftb.mods:ftb-chunks-neoforge:2101.1.1")
localImplementation("dev.ftb.mods:ftb-teams-neoforge:2101.1.0")
localImplementation("dev.ftb.mods:ftb-library-neoforge:2101.1.3")
if (ftb_enable.toBoolean()) {
localRuntimeOnly("dev.architectury:architectury-neoforge:13d.0.8")
localImplementation("dev.ftb.mods:ftb-chunks-neoforge:2101.1.1")
localImplementation("dev.ftb.mods:ftb-teams-neoforge:2101.1.0")
localImplementation("dev.ftb.mods:ftb-library-neoforge:2101.1.3")
}

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

compileOnly("xaero.lib:xaerolib-neoforge-1.21:1.0.42")
compileOnly("curse.maven:xaeros-world-map-317780:7401095")
if (xaero_enable.toBoolean()) {
compileOnly("xaero.lib:xaerolib-neoforge-1.21:1.0.42")
compileOnly("curse.maven:xaeros-world-map-317780:7401095")
}
}

sourceSets.main {
java {
if (!curios_enable.toBoolean()) {
exclude("com/simibubi/create/compat/curios/**")
}
if (!cc_tweaked_enable.toBoolean()) {
exclude("com/simibubi/create/compat/computercraft/implementation/**")
}
if (!farmers_delight_enable.toBoolean()) {
exclude("com/simibubi/create/compat/farmersdelight/**")
}
if (!ftb_enable.toBoolean()) {
exclude("com/simibubi/create/compat/ftb/**")
exclude("com/simibubi/create/compat/trainmap/FTBChunksTrainMap.java")
}
if (!journeymap_enable.toBoolean()) {
exclude("com/simibubi/create/compat/trainmap/JourneyTrainMap.java")
}
if (!xaero_enable.toBoolean()) {
exclude("com/simibubi/create/compat/trainmap/XaeroTrainMap.java")
exclude("com/simibubi/create/foundation/mixin/compat/xaeros/**")
}
}

resources {
Expand Down
32 changes: 19 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ org.gradle.parallel = true
org.gradle.caching = true

# Mod Info
mod_version = 6.0.11
minecraft_version = 1.21.1
mod_version = 6.1.0
minecraft_version = 26.2

mod_id = create
mod_name = Create
Expand All @@ -15,48 +15,54 @@ mod_license = Read attached LICENSE.md

# NeoForge
# https://neoforged.net/
neo_version = 21.1.219
neo_version = 26.2.0.8-beta

# Mappings
# https://parchmentmc.org/docs/getting-started
#
# parchment_minecraft_version being set to "same" will use minecraft_version
# parchment_version set to "none" will disable parchment mappings
parchment_minecraft_version = same
parchment_version = 2024.11.17
parchment_version = none

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

# Ponder
# https://maven.createmod.net/net/createmod/ponder/
ponder_version = 1.0.82
ponder_version = 1.0.90

# Flywheel & Vanillin
# https://maven.createmod.net/dev/engine-room/flywheel/
flywheel_version = 1.0.6
flywheel_version = 1.0.7
flywheel_version_range = [1.0.0,2.0)
# https://maven.createmod.net/dev/engine-room/vanillin/
vanillin_version = 1.1.3-41
vanillin_version = 1.1.4

# Just Enough Items
# https://modrinth.com/mod/jei/versions
jei_version = 19.21.0.247
jei_version = 30.7.0.40

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

# Sodium
# https://modrinth.com/mod/sodium/versions
sodium_version = 0.6.9
sodium_version = 0.9.1-beta.4

# CC: Tweaked
# https://modrinth.com/mod/cc-tweaked/versions
cc_tweaked_enable = true
cc_tweaked_version = 1.116.1
cc_tweaked_version = 1.120.1

# Farmer's Delight
# https://modrinth.com/mod/farmers-delight
farmers_delight_enable = true
farmers_delight_enable = false
farmers_delight_version = 1.21.1-1.2.9

# Local development/runtime integrations waiting for official 26.2 artifacts
ftb_enable = false
journeymap_enable = false
xaero_enable = false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 4 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
pluginManagement {
repositories {
mavenLocal()
if (providers.gradleProperty("create.useMavenLocal").isPresent()) {
mavenLocal()
}
gradlePluginPortal()
maven { url = "https://maven.neoforged.net/releases" }
}
}

if (file("Ponder").exists()) {
if (providers.gradleProperty("create.useLocalPonderComposite").isPresent() && file("Ponder").exists()) {
includeBuild(".")
includeBuild("Ponder") {
dependencySubstitution {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1.21.1 2025-11-02T10:48:42.611425877 create's mechanical crafting recipes
c525511634e4dcd29ff707cfea7c24570c4b8b9c data/create/recipe/mechanical_crafting/crushing_wheel.json
26079bcc4010920b0b9e294103ad6bf40e0d04aa data/create/recipe/mechanical_crafting/extendo_grip.json
b02bb2a27f3225d2993b9fa5f9369cdff19ea440 data/create/recipe/mechanical_crafting/potato_cannon.json
ad748f351a175305d8a988ac7f8657f9dcc7918c data/create/recipe/mechanical_crafting/wand_of_symmetry.json
// 26.2 2026-07-08T18:29:28.9128298 create's mechanical crafting recipes
d4e712c345c100401633fe32f1fd6473f8395299 data/create/recipe/mechanical_crafting/crushing_wheel.json
11961184ebb9ce66e75465a96508699aa4112cff data/create/recipe/mechanical_crafting/extendo_grip.json
bf2c843a3f1c6d450965176925aa353f67aaadec data/create/recipe/mechanical_crafting/potato_cannon.json
df3d63488c7f34e08e43384baf6e1d3394478bed data/create/recipe/mechanical_crafting/wand_of_symmetry.json
Loading