From 361c83fd73553341c18c9875cb0e204070aee4a7 Mon Sep 17 00:00:00 2001 From: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:47:29 -0500 Subject: [PATCH 1/2] Add the get optional methods --- .../slimefun4/api/items/SlimefunItem.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java index 0d4b1f12f..7db2dc5a2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java @@ -1161,6 +1161,17 @@ public class SlimefunItem implements Placeable { return Slimefun.getRegistry().getSlimefunItemIds().get(id); } + /** + * Retrieve a {@link Optional}<{@link SlimefunItem}> by its id. + * + * @param id + * The id of the {@link SlimefunItem} + * @return The {@link Optional}<{@link SlimefunItem}> associated with that id. Empty if non-existent + */ + public static @Nonnull Optional getOptionalById(@Nonnull String id) { + return Optional.ofNullable(getById(id)); + } + /** * Retrieve a {@link SlimefunItem} from an {@link ItemStack}. * @@ -1208,4 +1219,15 @@ public class SlimefunItem implements Placeable { return null; } + /** + * Retrieve a {@link Optional}<{@link SlimefunItem}> from an {@link ItemStack}. + * + * @param item + * The {@link ItemStack} to check + * @return The {@link Optional}<{@link SlimefunItem}> associated with this {@link ItemStack} if present, otherwise empty + */ + public @Nonnull Optional getOptionalByItem(@Nullable ItemStack item) { + return Optional.ofNullable(getByItem(item)); + } + } \ No newline at end of file From 25ac1655d6209f2b7390c3c434ac18e10e586072 Mon Sep 17 00:00:00 2001 From: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:56:08 -0500 Subject: [PATCH 2/2] Remove accidental new line --- .../github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java index 6a54669cf..d3bc8368f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java @@ -1202,5 +1202,4 @@ public class SlimefunItem implements Placeable { public @Nonnull Optional getOptionalByItem(@Nullable ItemStack item) { return Optional.ofNullable(getByItem(item)); } - }