Merge branch 'mc1.20.1/dev' into mc1.20.1/mmc-5

Author: Attack8

.github/workflows/build.yml

@@ -21,8 +21,6 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-home-cache-cleanup: true
 
       - name: Validate Gradle Wrapper Integrity
         uses: gradle/actions/wrapper-validation@v3

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'
 }
 
@@ -158,7 +159,7 @@ dependencies {
     modRuntimeOnly(jarJar("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
         version {
             strictly "[1.0,2.0)"
-            prefer "1.0.1"
+            prefer flywheel_version
         }
     })
     modRuntimeOnly("dev.engine-room.vanillin:vanillin-forge-${flywheel_minecraft_version}:${vanillin_version}")
@@ -302,9 +303,11 @@ tasks.named("sourcesJar") {
 
 final slimJar = tasks.register("slimJar", Jar) {
     archiveClassifier = "slim"
-    from sourceSets.main.output
+    from(sourceSets.main.output)
+    from(refmap)
     manifest.attributes([
-        "Git-Hash": gitHash
+        "MixinConfigs": "create.mixins.json",
+        "Git-Hash"    : gitHash
     ])
 }
 obfuscation.reobfuscate(slimJar, sourceSets.main)

changelog.md

@@ -4,7 +4,48 @@ Create 6.0.2
 
 #### Bug Fixes
 
-- Fix warning getting logged when cc: tweaked isn't installed
+- Fix warning getting logged when CC: Tweaked isn't installed
+- Fix crash when using LecternDisplayTarget #7579 #7600
+- Fix crash with fluids on contraptions
+- Fixed Shopping lists disappearing when clicking a different table cloth #7548
+- Fix mixin conflict with immersive portals
+- Fix factory gauge display sources causing crashes #7645
+- Fix Schematics sometimes rendering block entity elements when it shouldn't #7639
+- Fix Chiseled Bookshelves having wrong the blockstates when placed with a schematic cannon #7642
+- Fix horizontal crushing wheels not working properly #7445
+- Fix rotating shader not correctly handling color
+- Fix StockKeeperCategoryScreen filter buttons being clickable outside the window bounds #7668
+- Fix diving armor being trimmable (1.21.1)
+- Fix diving helmets not having aqua affinity #7433 (1.21.1)
+- Fix crash when using deployers wielding weapons #7704 (1.21.1)
+- Fix threshold switch UI causing a crash if opened too quickly after breaking the storage block it was looking at #7676
+- Fix rotated steam engines still working #7616
+- Fix button of contraption controls not rendering on contraptions #7701
+- Fix error/crash with CurrentFloorDisplaySource #7700
+- Fix the ability to redeem shopping lists at other shop networks #7657
+- Add bowls, mushroom stew and suspicious stew to the upright on belt tag
+- Fix shopping lists not working on servers
+- Fix rotation keybind not supporting mouse buttons
+- Fixed deployers not being able to harvest honeycomb with modded shears #4570
+- Safety check for schedule pointer exceeding the total count #7492
+- Fixed packager unpacking leading to item multiplication in special modded inventories #7426
+- Fixed redstone links not updating neighbours when toggling from receiver to transmitter #7715
+- Fix KineticStressDisplaySource not working properly #7659
+- Fix sequenced assembly not correctly handling errors (1.21.1)
+- The JEI search bar is now synchronised to the stock keeper search bar (configurable)
+- Fixed JEI plugin modifying ingredient fluid amounts for visual purposes
+- Fixed belts moving a sneaking player even when not wearing the full cardboard set #7691
+- Packagers can now read multiple lines on signs for package addressing
+- Factory Gauge request interval is now configurable
+- Fixed train map integration crashing when there are derailed trains or trains in another dimension (1.21.1)
+- Fixed cardboard armor rendering not respecting custom player scaling
+
+#### API Changes
+
+- Implement custom unpacking API
+- Implement InventoryIdentifier API
+- Lock Create's registrate instance behind a caller check, prevent other mods and addons from using it
+- Implement CreateRegistrateRegistrationCallback
 
 ------------------------------------------------------
 Create 6.0.1

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.1
-build_info_mod_version = 6.0.1
+mod_version = 6.0.2
+build_info_mod_version = 6.0.2
 artifact_minecraft_version = 1.20.1
 
 minecraft_version = 1.20.1
@@ -23,10 +23,10 @@ flywheel_minecraft_version = 1.20.1
 flywheel_version = 1.0.1
 vanillin_version = 1.0.0-beta-217
 jei_minecraft_version = 1.20.1
-jei_version = 15.19.0.85
+jei_version = 15.19.5.99
 curios_minecraft_version = 1.20.1
 curios_version = 5.3.1
-ponder_version = 1.0.39
+ponder_version = 1.0.51
 mixin_extras_version = 0.4.1
 
 cc_tweaked_enable = true