From 345035887fa01e804b2829a87358bca661221185 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Fri, 5 Jan 2024 22:25:44 +0100 Subject: Add jakarta NonNull annotations --- build.gradle | 2 ++ gradle.properties | 4 +++- src/main/java/lv/enes/mc/eris_alchemy/CovalenceRepair.java | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 29c2585..2c618b9 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,8 @@ dependencies { modImplementation("vazkii.patchouli:Patchouli:${patchouli_version}") { exclude group: "net.fabricmc", module: "fabric-loader" } + + compileOnly "jakarta.annotation:jakarta.annotation-api:${jakarta_annotation_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index a78fc4a..6dc6f57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,6 @@ quilt_mappings = 23 loader_version = 0.23.0 quilted_fabric_api_version = 7.4.0+0.90.0 -patchouli_version = 1.20.1-84-FABRIC \ No newline at end of file +patchouli_version = 1.20.1-84-FABRIC + +jakarta_annotation_version = 2.1.1 \ No newline at end of file diff --git a/src/main/java/lv/enes/mc/eris_alchemy/CovalenceRepair.java b/src/main/java/lv/enes/mc/eris_alchemy/CovalenceRepair.java index 2e9da77..f094342 100644 --- a/src/main/java/lv/enes/mc/eris_alchemy/CovalenceRepair.java +++ b/src/main/java/lv/enes/mc/eris_alchemy/CovalenceRepair.java @@ -4,6 +4,7 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; +import jakarta.annotation.Nonnull; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -43,6 +44,7 @@ public class CovalenceRepair extends CustomRecipe { return res; } + @Nonnull @Override public CovalenceRepair fromJson(ResourceLocation id, JsonObject json) { var recipeJson = new Gson().fromJson(json, Json.class); @@ -65,6 +67,7 @@ public class CovalenceRepair extends CustomRecipe { recipe.tools.toNetwork(buf); } + @Nonnull @Override public CovalenceRepair fromNetwork(ResourceLocation id, FriendlyByteBuf buf) { var category = buf.readEnum(CraftingBookCategory.class); @@ -104,6 +107,7 @@ public class CovalenceRepair extends CustomRecipe { return getInputs(inventory) != null; } + @Nonnull @Override public ItemStack assemble(CraftingContainer inventory, RegistryAccess registryManager) { var inputs = getInputs(inventory); @@ -117,8 +121,9 @@ public class CovalenceRepair extends CustomRecipe { return newToolStack; } + @Nonnull @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return Serializer.INSTANCE; } -- cgit v1.2.3