Merge pull request #286 from FTBTeam/1.19/dev

build: updated build toolchain to fix mixin remap issues
FTBTeam · Jun 11, 2024 · bbb0c66 · bbb0c66
2 parents b072d0e + 69eef8d
commit bbb0c66
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<ResourceKey<Level>,Long2ObjectMap<UUID>> getForceLoadedChunks() {
 		return forceLoadedChunkCache;
 	}
 
-	@Nonnull
+	@NotNull
 	public Long2ObjectMap<UUID> getForceLoadedChunks(ResourceKey<Level> dimension) {
 		return getForceLoadedChunks().getOrDefault(dimension, EMPTY_CHUNKS);
 	}

diff --git 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
@@ -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
@@ -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
@@ -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
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip