From 69eef8d5618fecb8b230a0279363b4f94679a1ca Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Tue, 11 Jun 2024 11:25:24 +0100 Subject: [PATCH] build: updated build toolchain to fix mixin remap issues https://github.com/FTBTeam/FTB-Mods-Issues/issues/1214 --- CHANGELOG.md | 5 +++++ build.gradle | 2 +- .../dev/ftb/mods/ftbchunks/client/MinimapPosition.java | 2 +- .../java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java | 6 +++--- .../dev/ftb/mods/ftbchunks/data/ClaimedChunkManager.java | 4 ++-- fabric/build.gradle | 8 ++++++-- forge/build.gradle | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b88e5b0..611b48bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1902.4.6] + +### Fixed +* Updated the build toolchain to fix refmap reobfuscation issues introduced in 1902.4.5 + ## [1902.4.5] ### Fixed diff --git a/build.gradle b/build.gradle index d2ad886a..1222e73b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false } architectury { diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/MinimapPosition.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/MinimapPosition.java index 793ef8a3..28798bb9 100644 --- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/MinimapPosition.java +++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/MinimapPosition.java @@ -1,8 +1,8 @@ package dev.ftb.mods.ftbchunks.client; import dev.ftb.mods.ftblibrary.config.NameMap; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.function.Predicate; /** diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java index 1278ed39..2079c4a0 100644 --- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java +++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java @@ -10,9 +10,9 @@ import dev.ftb.mods.ftblibrary.math.XZ; import net.minecraft.client.Minecraft; import net.minecraft.world.level.ChunkPos; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.Collection; import java.util.HashMap; @@ -63,14 +63,14 @@ public long getLastDataAccess() { return lastDataAccess; } - @Nonnull + @NotNull public MapRegionData getDataBlocking() { synchronized (dimension.manager.lock) { return getDataBlockingNoSync(); } } - @Nonnull + @NotNull public MapRegionData getDataBlockingNoSync() { if (data == null) { data = new MapRegionData(this); diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunkManager.java b/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunkManager.java index 63b01a79..cbfefd15 100644 --- a/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunkManager.java +++ b/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunkManager.java @@ -26,9 +26,9 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.storage.LevelResource; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -251,7 +251,7 @@ public Map,Long2ObjectMap> getForceLoadedChunks() { return forceLoadedChunkCache; } - @Nonnull + @NotNull public Long2ObjectMap getForceLoadedChunks(ResourceKey dimension) { return getForceLoadedChunks().getOrDefault(dimension, EMPTY_CHUNKS); } diff --git a/fabric/build.gradle b/fabric/build.gradle index 72db6180..be7c1dca 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -77,9 +77,13 @@ processResources { } } +sourcesJar { + dependsOn copyAccessWidener +} + shadowJar { configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier("dev-shadow") } remapJar { @@ -90,7 +94,7 @@ remapJar { } jar { - classifier "dev" + setArchiveClassifier("dev") } components.java { diff --git a/forge/build.gradle b/forge/build.gradle index 23e09c19..0d3074e4 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -90,7 +90,7 @@ shadowJar { exclude "fabric.mod.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier("dev-shadow") } remapJar { @@ -113,7 +113,7 @@ jar { ]) } - classifier "dev" + setArchiveClassifier("dev") } components.java { diff --git a/gradle.properties b/gradle.properties index 8e60ff1f..b76fb73a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.daemon=false mod_id=ftbchunks archives_base_name=ftb-chunks maven_group=dev.ftb.mods -mod_version=1902.4.5 +mod_version=1902.4.6 mod_author=FTB Team minecraft_version=1.19.2 forge_version=43.2.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04c7be76..38407fb5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip