From ec812ef5fbcaca4f050fdf12748e739cbcd0b059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Jun 2025 21:33:56 -0600 Subject: [PATCH] Build fixes and update allay --- buildSrc/src/main/kotlin/DependencyConfig.kt | 4 ++-- buildSrc/src/main/kotlin/Versions.kt | 2 +- common/api/build.gradle.kts | 1 + .../allay/src/main/java/com/dfsek/terra/allay/Mapping.java | 2 +- .../java/com/dfsek/terra/allay/delegate/AllayItemStack.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt index 193a9a49a..80dd7730d 100644 --- a/buildSrc/src/main/kotlin/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -63,8 +63,8 @@ fun Project.configureDependencies() { } dependencies { - testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit) - testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit) + testImplementation("org.junit.jupiter", "junit-jupiter", Versions.Libraries.Internal.junit) + "testRuntimeOnly"("org.junit.platform", "junit-platform-launcher") compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations) compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b971af8c7..e5512292e 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -79,7 +79,7 @@ object Versions { } object Allay { - const val api = "0.2.0" + const val api = "0.4.1" const val gson = "2.13.1" const val mappings = "3626653" const val mappingsGenerator = "366618e" diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts index 1f99839bd..6fb1bc9e7 100644 --- a/common/api/build.gradle.kts +++ b/common/api/build.gradle.kts @@ -2,6 +2,7 @@ dependencies { api("ca.solo-studios", "strata", Versions.Libraries.strata) compileOnlyApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j) testImplementation("org.slf4j", "slf4j-api", Versions.Libraries.slf4j) + api("org.incendo", "cloud-core", Versions.Libraries.cloud) api("com.dfsek.tectonic", "common", Versions.Libraries.tectonic) diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java index a29b1a735..222f6f53f 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java @@ -16,8 +16,8 @@ import org.allaymc.api.block.type.BlockStateSafeGetter; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.api.item.type.ItemType; import org.allaymc.api.item.type.ItemTypeSafeGetter; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java index 8c6b03e35..bf7e59479 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java @@ -38,7 +38,7 @@ public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terr allayItemStack.addEnchantment(enchantment.getType(), enchantment.getLevel()); } allayItemStack.setLore(targetItem.getLore()); - allayItemStack.setDurability(targetItem.getDurability()); + allayItemStack.setDamage(targetItem.getDamage()); allayItemStack.setCustomName(targetItem.getCustomName()); allayItemStack.setMeta(targetItem.getMeta()); }