Merge branch 'mc1.20.1/dev' into mc1.20.1/tcmods-data-compat

Author: VoidLeech

.github/workflows/build.yml

@@ -21,11 +21,9 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-home-cache-cleanup: true
 
       - name: Validate Gradle Wrapper Integrity
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Build
         run: ./gradlew build

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
           cache-disabled: true
 
       - name: Validate Gradle Wrapper Integrity
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Build & Publish
         env:

build.gradle

@@ -16,7 +16,7 @@ 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" : "")}\""
+String gitHash = "${calculateGitHash() + (hasUnstaged() ? "-modified" : "")}"
 
 base {
     archivesName = "create-${artifact_minecraft_version}"
@@ -34,8 +34,9 @@ if (ponderInWorkspace) {
 project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? 'enabled' : 'disabled'} for project ${project.name}.")
 project.logger.lifecycle("Dependencies included in Workspace: [Ponder: ${ponderInWorkspace}]")
 
+def refmap
 mixin {
-    add sourceSets.main, 'create.refmap.json'
+    refmap = add sourceSets.main, 'create.refmap.json'
     config 'create.mixins.json'
 }
 
@@ -149,34 +150,19 @@ repositories {
 }
 
 dependencies {
-    jarJar("com.tterrag.registrate:Registrate:${registrate_version}") {
-        version {
-            strictly "[MC1.20-1.3.3,)"
-        }
-    }
-    jarJar("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
-        version {
-            strictly "[1.0,2.0)"
-        }
-    }
+    modImplementation(jarJar("com.tterrag.registrate:Registrate:${registrate_version}"))
+    jarJar("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
 
-    jarJar("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}") {
-        version {
-            strictly "[${ponder_version},)"
-        }
-    }
+    implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixin_extras_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}") {
         version {
-            strictly "[${mixin_extras_version},)"
+            strictly "[1.0,2.0)"
+            prefer "1.0.1"
         }
-    }
-
-    modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
-
-    modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${flywheel_minecraft_version}:${flywheel_version}")
-    modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
-    modRuntimeOnly("dev.engine-room.vanillin:vanillin-forge-${flywheel_minecraft_version}:${flywheel_version}")
+    })
+    modRuntimeOnly("dev.engine-room.vanillin:vanillin-forge-${flywheel_minecraft_version}:${vanillin_version}")
 
     if (ponderInWorkspace) {
         implementation project(":ponder:Common")
@@ -247,6 +233,7 @@ dependencies {
     // modRuntimeOnly("curse.maven:blueprint-382216:4749000")
     // modRuntimeOnly("curse.maven:windsweptmod-636321:4817132")
     // modRuntimeOnly("curse.maven:good-ending-690161:4363719")
+    // modRuntimeOnly("curse.maven:inventory-sorter-240633:5979609")
 
     // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
     // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
@@ -306,11 +293,26 @@ tasks.named("sourcesJar") {
     ])
 }
 
+final slimJar = tasks.register("slimJar", Jar) {
+    archiveClassifier = "slim"
+    from(sourceSets.main.output)
+    from(refmap)
+    manifest.attributes([
+        "MixinConfigs": "create.mixins.json",
+        "Git-Hash"    : gitHash
+    ])
+}
+obfuscation.reobfuscate(slimJar, sourceSets.main)
+
 project.publishing {
     publications {
         mavenJava(MavenPublication) {
             artifactId base.archivesName.get()
             from components.java
+
+            artifact(tasks.jar) {
+                classifier = "all"
+            }
         }
     }
 
@@ -337,6 +339,7 @@ publishMods {
     file = reobfJar.archiveFile
     changelog = ChangelogText.getChangelogText(project).toString()
     type = STABLE
+    version = "$minecraft_version-$mod_version"
     displayName = "$mod_name $mod_version for mc$minecraft_version"
     modLoaders.add("forge")
     modLoaders.add("neoforge")

changelog.md

@@ -1,3 +1,43 @@
+------------------------------------------------------
+Create 6.0.2
+------------------------------------------------------
+
+#### Bug Fixes
+
+- Fix warning getting logged when cc: tweaked isn't installed
+
+------------------------------------------------------
+Create 6.0.1
+------------------------------------------------------
+
+#### Bug Fixes
+
+- Fixed Shopping lists not updating when adding purchases (1.21) #7449 #7393
+- Fixed Frogport ponder scene not animating correctly (1.21)
+- Fixed broken address filter in second stock ticker ponder scene (1.21)
+- Fixed crash when modifying pipe structures while they are transporting fluids (1.21) #7515
+- Fixed shift-inserting into toolboxes causing items to be voided (1.21) #7519
+- Fixed inconsistent component serialisation in backtank BE (1.21)
+- Fixed table cloths not showing tooltips and enchantment effect when configured (1.21)
+- Fixed shopping list tooltip expanding as its viewed (1.21) #7503
+- Fixed crash when selling enchanted items on a table cloth (1.21) #7516 #7536
+- Added a tooltip for the stock keeper address input
+- Fixed crash when re-packaging a duplicated package fragment #7456
+- Fixed crash when ctrl-click copying a gauge #7431
+- Safety check for unexpected string modifications in address edit boxes #7409
+- Fixed crash with fluid propagator
+- Fixed a crash when using factory gauges
+- Fixed debug info command not translating the graphics mode text
+- Fixed cardboard sword not being able to damage arthropod mobs other than the spider
+- Fixed a crash that occurred when placing a stock link on a re-packager
+- Fixed an issue where wearing diving boots and sprinting would force you into the swim position and then out of it
+  right away
+- Fixed item group attribute filters crashing
+- Fixed mixin conflict with immersive portals
+- Fixed processing output not supporting itemstack components
+- Fixed crash when shift-clicking items in the package filter UI #7497
+- Fixed crash caused by the create menu button when loaded too early #7521
+
 ------------------------------------------------------
 Create 6.0.0
 ------------------------------------------------------

gradle.properties

@@ -7,8 +7,8 @@ org.gradle.caching = true
 
 # mod version info
 # build_info_mod_version is the version that gets filled into CreateBuildInfo.java
-mod_version = 6.0.0
-build_info_mod_version = 6.0.0
+mod_version = 6.0.1
+build_info_mod_version = 6.0.1
 artifact_minecraft_version = 1.20.1
 
 minecraft_version = 1.20.1
@@ -20,12 +20,13 @@ use_parchment = true
 # dependency versions
 registrate_version = MC1.20-1.3.3
 flywheel_minecraft_version = 1.20.1
-flywheel_version = 1.0.0-beta-212
+flywheel_version = 1.0.1
+vanillin_version = 1.0.0-beta-217
 jei_minecraft_version = 1.20.1
 jei_version = 15.19.0.85
 curios_minecraft_version = 1.20.1
 curios_version = 5.3.1
-ponder_version = 1.0.34
+ponder_version = 1.0.45
 mixin_extras_version = 0.4.1
 
 cc_tweaked_enable = true