diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4c12e..e8cc115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [2.2.2] + +### Fixed + +- Mixin issues + ## [2.2.1] ### Added diff --git a/build.gradle b/build.gradle index 3d6aad7..8998ded 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.5-SNAPSHOT" apply false } architectury { diff --git a/common/src/main/java/dev/ftb/packcompanion/features/loot/RandomNameLootFunction.java b/common/src/main/java/dev/ftb/packcompanion/features/loot/RandomNameLootFunction.java index ed15fe3..af8d8ba 100644 --- a/common/src/main/java/dev/ftb/packcompanion/features/loot/RandomNameLootFunction.java +++ b/common/src/main/java/dev/ftb/packcompanion/features/loot/RandomNameLootFunction.java @@ -16,10 +16,10 @@ import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/fabric/build.gradle b/fabric/build.gradle index 9c9b6fe..5d99634 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -92,18 +92,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier "dev-shadow" } remapJar { injectAccessWidener = true input.set shadowJar.archiveFile dependsOn shadowJar - classifier null + setArchiveClassifier null } jar { - classifier "dev" + setArchiveClassifier "dev" } sourcesJar { diff --git a/forge/build.gradle b/forge/build.gradle index 1e0ef5b..f8c29a7 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -88,17 +88,17 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier "dev-shadow" } remapJar { input.set shadowJar.archiveFile dependsOn shadowJar - classifier null + setArchiveClassifier null } jar { - classifier "dev" + setArchiveClassifier "dev" } sourcesJar { diff --git a/gradle.properties b/gradle.properties index c30818d..e7ab575 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.19.2 enabled_platforms=fabric,forge archives_base_name=ftb-pack-companion -mod_version=2.2.1 +mod_version=2.2.2 maven_group=dev.ftb.mods architectury_version=6.4.62 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists