Merge branch 'mc1.20.1/dev' into contraption_container_reloaded

Author: Allmoz

.editorconfig

@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{*.markdown,*.md}]
+ij_markdown_wrap_text_if_long = false
+
 [*.yml]
 indent_size = 2
 
@@ -25,5 +28,5 @@ ij_java_blank_lines_before_method_body = 0
 ij_java_else_on_new_line = false
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
-ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,com.**,|,*,|,net.minecraftforge.**
+ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *, |, net.minecraftforge.**
 ij_java_insert_inner_class_imports = true

build.gradle

@@ -1,46 +1,46 @@
 import dev.ithundxr.silk.ChangelogText
 
 plugins {
-    id "idea"
-    id "eclipse"
-    id "maven-publish"
-    id "net.neoforged.moddev.legacyforge" version "2.0.74"
-    id "me.modmuss50.mod-publish-plugin" version "0.8.3"
-    id "dev.ithundxr.silk" version "0.11.15"
-    id "net.kyori.blossom" version "2.1.0" // https://github.com/KyoriPowered/blossom
-    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.8" // https://github.com/JetBrains/gradle-idea-ext-plugin
+    id("idea")
+    id("eclipse")
+    id("maven-publish")
+    id("net.kyori.blossom") version "2.1.0" // https://github.com/KyoriPowered/blossom
+    id("dev.ithundxr.silk") version "0.11.15" // https://github.com/ithundxr/silk
+    id("me.modmuss50.mod-publish-plugin") version "0.8.4" // https://github.com/modmuss50/mod-publish-plugin
+    id("net.neoforged.moddev.legacyforge") version "2.0.107" // https://projects.neoforged.net/neoforged/ModDevGradle
+    id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8" // https://github.com/JetBrains/gradle-idea-ext-plugin
 }
 
-apply from: "./gradle/java.gradle"
-apply from: "gradle/property_loader.gradle"
+apply(from: "./gradle/java.gradle")
+apply(from: "gradle/property_loader.gradle")
 
-boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false')
-ext.buildNumber = System.getenv('BUILD_NUMBER')
-String gitHash = "${calculateGitHash() + (hasUnstaged() ? "-modified" : "")}"
+boolean dev = System.getenv("RELEASE") == null || System.getenv("RELEASE") == "false"
+ext.buildNumber = System.getenv("BUILD_NUMBER")
+String gitHash = calculateGitHash() + (hasUnstaged() ? "-modified" : "")
 
 base {
     archivesName = "create-${artifact_minecraft_version}"
-    group = 'com.simibubi.create'
-    version = mod_version + (dev && buildNumber != null ? "-${buildNumber}" : '')
+    group = "com.simibubi.create"
+    version = mod_version + (dev && buildNumber != null ? "-${buildNumber}" : "")
 }
 
-boolean inMultiModWorkspace = rootProject.hasProperty('multiModWorkspace.enabled')
-boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder')
+boolean inMultiModWorkspace = rootProject.hasProperty("multiModWorkspace.enabled")
+boolean ponderInWorkspace = rootProject.hasProperty("multiModWorkspace.ponder")
 
 if (ponderInWorkspace) {
     evaluationDependsOn(":ponder:Forge")
 }
 
-project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? 'enabled' : 'disabled'} for project ${project.name}.")
+project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? "enabled" : "disabled"} for project ${project.name}.")
 project.logger.lifecycle("Dependencies included in Workspace: [Ponder: ${ponderInWorkspace}]")
 
-def refmap
+Provider<RegularFile> refmap
 mixin {
-    refmap = add sourceSets.main, 'create.refmap.json'
-    config 'create.mixins.json'
+    refmap = add(sourceSets.main, "create.refmap.json")
+    config "create.mixins.json"
 }
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
+println("Java: ${System.getProperty("java.version")}, JVM: ${System.getProperty("java.vm.version")} (${System.getProperty("java.vendor")}), Arch: ${System.getProperty("os.arch")}")
 
 idea {
     module {
@@ -55,7 +55,7 @@ legacyForge {
     // TODO - Try turning this on later
     validateAccessTransformers = false
 
-    if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) {
+    if (file("src/main/resources/META-INF/accesstransformer.cfg").exists()) {
         accessTransformers.from "src/main/resources/META-INF/accesstransformer.cfg"
     }
 
@@ -66,59 +66,63 @@ legacyForge {
 
     mods {
         create {
-            sourceSet sourceSets.main
+            sourceSet(sourceSets.main)
         }
 
         if (ponderInWorkspace) {
             ponder {
-                sourceSet project(":ponder:Common").sourceSets.main
-                sourceSet project(":ponder:Forge").sourceSets.main
+                sourceSet(project(":ponder:Common").sourceSets.main)
+                sourceSet(project(":ponder:Forge").sourceSets.main)
             }
         }
     }
 
     runs {
         // applies to all the run configs below
         configureEach {
-            systemProperty 'forge.logging.markers', ''
-            systemProperty 'forge.logging.console.level', 'info'
+            systemProperty("forge.logging.markers", "")
+            systemProperty("forge.logging.console.level", "info")
             jvmArguments = ["-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition"]
             //jvmArgs("-XX:-OmitStackTraceInFastThrow") // uncomment when you get exceptions with null messages etc
-            //jvmArgs '-XX:+UnlockCommercialFeatures' // uncomment for profiling
+            //jvmArgs "-XX:+UnlockCommercialFeatures" // uncomment for profiling
 
-            systemProperty 'mixin.debug.export', 'true'
-            systemProperty 'mixin.debug.verbose', 'true'
+            systemProperty("mixin.debug.export", "true")
+            systemProperty("mixin.debug.verbose", "true")
 
-            programArgument '-mixin.config=create.mixins.json'
-            programArgument '-mixin.config=ponder.mixins.json'
+            programArgument("-mixin.config=create.mixins.json")
+            programArgument("-mixin.config=ponder.mixins.json")
         }
 
         client {
             client()
 
-            gameDirectory = project.file('run')
+            gameDirectory = project.file("run")
         }
 
         server {
             server()
 
-            gameDirectory = project.file('run/server')
+            gameDirectory = project.file("run/server")
         }
 
         data {
             data()
 
-            gameDirectory = project.file('run')
-            systemProperty 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            systemProperty 'forge.logging.console.level', 'debug'
-            programArguments.addAll("--mod", mod_id as String, "--all", "--output", file("src/generated/resources/").getAbsolutePath(), "--existing", file("src/main/resources").getAbsolutePath())
+            gameDirectory = project.file("run")
+            systemProperty("forge.logging.markers", "REGISTRIES,REGISTRYDUMP")
+            systemProperty("forge.logging.console.level", "debug")
+            programArguments.addAll(
+                "--mod", mod_id as String,
+                "--all",
+                "--output", file("src/generated/resources/").getAbsolutePath(),
+                "--existing", file("src/main/resources").getAbsolutePath()
+            )
         }
 
         gameTestServer {
             type = "gameTestServer"
 
-            gameDirectory = project.file('run/gametest')
-            // setForceExit false <- FIXME 1.20
+            gameDirectory = project.file("run/gametest")
         }
     }
 }
@@ -151,9 +155,6 @@ repositories {
 
 dependencies {
     modImplementation(jarJar("com.tterrag.registrate:Registrate:${registrate_version}"))
-    jarJar("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
-
-    implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}"))
 
     modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${flywheel_minecraft_version}:${flywheel_version}")
     modRuntimeOnly(jarJar("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
@@ -165,12 +166,13 @@ dependencies {
     modRuntimeOnly("dev.engine-room.vanillin:vanillin-forge-${flywheel_minecraft_version}:${vanillin_version}")
 
     if (ponderInWorkspace) {
-        implementation project(":ponder:Common")
-        implementation project(":ponder:Forge")
+        jarJar(implementation(project(":ponder:Common")))
+        jarJar(implementation(project(":ponder:Forge")))
     } else {
-        modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
+        jarJar(modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
     }
 
+    implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}"))
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
 
     // modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
@@ -196,11 +198,13 @@ dependencies {
 
     // Compile only because architectury breaks packets
     modCompileOnly("dev.architectury:architectury-forge:9.1.12")
-    modCompileOnly("dev.ftb.mods:ftb-chunks-forge:2001.3.1")
-    modCompileOnly("dev.ftb.mods:ftb-teams-forge:2001.3.0")
-    modCompileOnly("dev.ftb.mods:ftb-library-forge:2001.2.4")
+    modCompileOnly("dev.ftb.mods:ftb-chunks-forge:2001.1.4")
+    modCompileOnly("dev.ftb.mods:ftb-teams-forge:2001.1.4")
+    modCompileOnly("dev.ftb.mods:ftb-library-forge:2001.1.4")
 
     modImplementation("curse.maven:journeymap-32274:5457831")
+    // Compile only to prevent there from being multiple map mods in the dev env
+    modCompileOnly("curse.maven:xaeros-world-map-317780:6212636")
     // modImplementation("ignored:journeymap-1.20.1-5.10.1-forge")
 
     // modRuntimeOnly("curse.maven:framedblocks-441647:5399211")
@@ -241,21 +245,22 @@ dependencies {
     // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
     // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
     // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
-    if (!Boolean.getBoolean('idea.sync.active')) {
+    if (!Boolean.getBoolean("idea.sync.active")) {
         annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
     }
 }
 
 sourceSets.main {
     java {
         if (!cc_tweaked_enable.toBoolean()) {
-            exclude 'com/simibubi/create/compat/computercraft/implementation/**'
+            exclude "com/simibubi/create/compat/computercraft/implementation/**"
         }
     }
 
     resources {
-        srcDir 'src/generated/resources'
-        exclude '.cache/'
+        srcDir("src/generated/resources")
+        exclude(".cache/")
+        exclude("data/create/.wiki")
     }
 
     blossom.javaSources {
@@ -265,23 +270,27 @@ sourceSets.main {
 }
 
 processResources {
-    def buildProps = project.properties.clone()
+    var replaceProperties = [
+        mod_id         : mod_id,
+        mod_name       : mod_name,
+        mod_author     : mod_author,
+        mod_description: mod_description,
+        mod_license    : mod_license,
+    ]
 
     // Replaces FML's magic file.jarVersion string with the correct version at build time.
-    buildProps.put('file', [jarVersion: project.version])
+    replaceProperties.put("file", [jarVersion: project.version])
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand buildProps
+    filesMatching(["META-INF/mods.toml"]) {
+        expand(replaceProperties)
     }
 }
 
-compileJava {
-    options.compilerArgs = ['-Xdiags:verbose']
-}
-
 jar {
-    from('LICENSE') {
-        rename { "${it}_${archivesBaseName}" }
+    String name = base.archivesName.get()
+
+    from("LICENSE") {
+        rename { "${it}_${name}" }
     }
 
     manifest.attributes([
@@ -332,7 +341,7 @@ project.publishing {
             }
         }
 
-        if (project.hasProperty('mavendir')) {
+        if (project.hasProperty("mavendir")) {
             maven { url mavendir }
         }
     }
@@ -342,7 +351,7 @@ publishMods {
     file = reobfJar.archiveFile
     changelog = ChangelogText.getChangelogText(project).toString()
     type = STABLE
-    version = "$minecraft_version-$mod_version"
+    version = "mc$minecraft_version-$mod_version"
     displayName = "$mod_name $mod_version for mc$minecraft_version"
     modLoaders.add("forge")
     modLoaders.add("neoforge")
@@ -358,11 +367,22 @@ publishMods {
         projectId = "LNytGWDc"
         minecraftVersions.add(minecraft_version)
     }
+
+    github {
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        repository = "Creators-of-Create/Create"
+        commitish = gitHash
+        tagName = "mc$minecraft_version-$mod_version"
+        file.unset()
+        file.unsetConvention()
+
+        allowEmptyFiles = true
+    }
 }
 
 String calculateGitHash() {
     try {
-        def output = providers.exec {
+        ExecOutput output = providers.exec {
             commandLine("git", "rev-parse", "HEAD")
         }
         return output.standardOutput.asText.get().trim()
@@ -373,7 +393,7 @@ String calculateGitHash() {
 
 boolean hasUnstaged() {
     try {
-        def output = providers.exec {
+        ExecOutput output = providers.exec {
             commandLine("git", "status", "--porcelain")
         }
         String result = output.standardOutput.asText.get().replace("/M gradlew(\\.bat)?/", "").trim()

changelog.md

@@ -99,8 +99,7 @@ Create 6.0.6
 - Allow other mods and addons to use ValueSettingsFormatter without needing to use translations prefixed with "create."
   #8322
 - Refactored datagen so that addons have a clear API to follow. #7861
-- Reworked ProcessingRecipe (Addon developers will need to adjust to these changes for their addon to work with 6.0.6) (
-  1.21.1) #7945
+- Reworked ProcessingRecipe (Addon developers will need to adjust to these changes for their addon to work with 6.0.6) (1.21.1) #7945
 
 ------------------------------------------------------
 Create 6.0.5

gradle.properties

@@ -6,18 +6,19 @@ org.gradle.parallel = true
 org.gradle.caching = true
 
 # mod version info
-mod_version = 6.0.6
+mod_version = 6.0.7
 artifact_minecraft_version = 1.20.1
 minecraft_version = 1.20.1
-forge_version = 47.2.6
+# 1.20.1: Neo is based on this version. Try not to bump
+forge_version = 47.1.33
 
 parchment_version = 2023.09.03
 use_parchment = true
 
 # dependency versions
 registrate_version = MC1.20-1.3.3
 flywheel_minecraft_version = 1.20.1
-flywheel_version = 1.0.4
+flywheel_version = 1.0.5-beta
 vanillin_version = 1.0.0
 jei_minecraft_version = 1.20.1
 jei_version = 15.20.0.106

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME