diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 714ba4769..56463034f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,9 +141,9 @@ jobs: ./gradlew "${gradle_args[@]}" first="$RUNNER_TEMP/basemetals-first" mkdir -p "$first" - cp build/libs/BaseMetals-3.0.1.113021.jar "$first/" - cp build/libs/BaseMetals-3.0.1.113021-sources.jar "$first/" - cp build/libs/BaseMetals-3.0.1.113021-javadoc.jar "$first/" + cp build/libs/BaseMetals-3.0.2.113021.jar "$first/" + cp build/libs/BaseMetals-3.0.2.113021-sources.jar "$first/" + cp build/libs/BaseMetals-3.0.2.113021-javadoc.jar "$first/" cp build/release/SHA256SUMS "$first/" - name: Rebuild and prove byte-identical archives @@ -159,9 +159,9 @@ jobs: -Dorg.gradle.java.installations.auto-download=false ) ./gradlew "${gradle_args[@]}" - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021.jar" build/libs/BaseMetals-3.0.1.113021.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021-sources.jar" build/libs/BaseMetals-3.0.1.113021-sources.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021-javadoc.jar" build/libs/BaseMetals-3.0.1.113021-javadoc.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.2.113021.jar" build/libs/BaseMetals-3.0.2.113021.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.2.113021-sources.jar" build/libs/BaseMetals-3.0.2.113021-sources.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.2.113021-javadoc.jar" build/libs/BaseMetals-3.0.2.113021-javadoc.jar cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS - name: Run exact-OreSpawn dedicated-server probe @@ -185,9 +185,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/BaseMetals-3.0.1.113021.jar - build/libs/BaseMetals-3.0.1.113021-sources.jar - build/libs/BaseMetals-3.0.1.113021-javadoc.jar + build/libs/BaseMetals-3.0.2.113021.jar + build/libs/BaseMetals-3.0.2.113021-sources.jar + build/libs/BaseMetals-3.0.2.113021-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 86ebc4753..7ac889a5c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,9 +1,7 @@ -Unreleased 1.13.2 migration repair +Base Metals 3.0.2.113021 -- Leave an already-correct Forge leaves data fixer unchanged instead of logging - a transformer failure. -- Still reject unrecognised fixer bytecode, and check both repair and repeat-load - paths. +- Fix an error converting leaves when you open a 1.10.2 or 1.12.2 world in + Minecraft 1.13.2. The converter now leaves already repaired code alone. Base Metals 3.0.1.113021 diff --git a/README.md b/README.md index 748f93eb7..99384da12 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,9 @@ IDs before Minecraft converts the chunks, and also converts old item names, durability and universal fluid buckets. Chunks containing only Base Metals items in containers are protected too. +Use Base Metals 3.0.2.113021 or later on Minecraft 1.13.2 when upgrading an old +world. This patch fixes a crash in Forge's leaves conversion. + Always perform the first upgrade on a copy of the world and keep the untouched original. Read [Migration](docs/MIGRATION.md) before opening an old save. A world already upgraded to Minecraft 1.18 must not be opened in this older diff --git a/build.gradle b/build.gradle index 3da9c9073..d6050c4c6 100644 --- a/build.gradle +++ b/build.gradle @@ -531,7 +531,7 @@ tasks.register('verifyReleaseConfiguration') { loaderCode: project.loader_code.toString(), javaVersion: project.java_version.toString(), gradleJavaVersion: project.gradle_java_version.toString(), curseForgeProjectId: project.curseforge_project_id.toString()] - def expected = [modVersion: '3.0.1.113021', modGroup: expectedMavenGroup, + def expected = [modVersion: '3.0.2.113021', modGroup: expectedMavenGroup, minecraftVersion: '1.13.2', forgeVersion: '25.0.223', forgeInstallerSha256: 'D46CB326E7DC32695084090C8169BB57F32F1C23B801DDB35A336F252E381191', mappingChannel: 'snapshot', mappingVersion: '20180921-1.13', @@ -620,7 +620,7 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException('Release manifest contains the wrong identity') } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') - if (modsToml.contains('${') || !modsToml.contains('version="3.0.1.113021"') + if (modsToml.contains('${') || !modsToml.contains("version=\"${project.mod_version}\"") || !modsToml.contains('versionRange="[4.1.0.113021,5.0.0)"')) { throw new GradleException('Release mods.toml contains unresolved or incompatible metadata') } diff --git a/gradle.properties b/gradle.properties index a872d516f..8b11d1725 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ mcp_version=20190213.203750 mod_id=basemetals mod_name=Base Metals mod_license=LGPL-2.1 -mod_version=3.0.1.113021 +mod_version=3.0.2.113021 # Maven coordinates and credits. mod_group=zone.moddev.mc.basemetals diff --git a/src/clientIntegrationTest/resources/META-INF/mods.toml b/src/clientIntegrationTest/resources/META-INF/mods.toml index 7b277accb..d9fcd24b1 100644 --- a/src/clientIntegrationTest/resources/META-INF/mods.toml +++ b/src/clientIntegrationTest/resources/META-INF/mods.toml @@ -11,7 +11,7 @@ description='''Build-only packaged-client checks for Base Metals 1.13.2.''' [[dependencies.basemetalsclientprobe]] modId="basemetals" mandatory=true -versionRange="[3.0.1.113021]" +versionRange="[3.0.2.113021]" ordering="AFTER" side="CLIENT" diff --git a/src/integrationTest/resources/META-INF/mods.toml b/src/integrationTest/resources/META-INF/mods.toml index df47f026f..5ea0505be 100644 --- a/src/integrationTest/resources/META-INF/mods.toml +++ b/src/integrationTest/resources/META-INF/mods.toml @@ -11,7 +11,7 @@ description='''Build-only lifecycle checks for Base Metals 1.13.2.''' [[dependencies.basemetalsprobe]] modId="basemetals" mandatory=true -versionRange="[3.0.1.113021]" +versionRange="[3.0.2.113021]" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7edb4ea78..9b8f804ca 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ issueTrackerURL="https://github.com/SkyBlade1978/BaseMetals/issues" [[mods]] modId="basemetals" -version="3.0.1.113021" +version="3.0.2.113021" displayName="Base Metals" displayURL="https://www.curseforge.com/minecraft/mc-mods/base-metals" authors="Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, the MMD Team"