BlueberryItem#getName is now @NotNull

BlueberryMC · Dec 16, 2021 · 100b975 · 100b975
1 parent 159c1ca
commit 100b975
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/Blueberry-API/src/main/java/net/blueberrymc/world/item/BlueberryItem.java b/Blueberry-API/src/main/java/net/blueberrymc/world/item/BlueberryItem.java
@@ -2,11 +2,8 @@
 
 import com.google.common.base.Preconditions;
 import net.blueberrymc.common.bml.BlueberryMod;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public abstract class BlueberryItem extends Item {
     private final BlueberryMod mod;
@@ -21,8 +18,4 @@ public BlueberryItem(@NotNull("mod") BlueberryMod mod, @NotNull("properties") Pr
     public final BlueberryMod getMod() {
         return mod;
     }
-
-    @Nullable
-    @Override
-    public abstract Component getName(@NotNull ItemStack itemStack);
 }
diff --git a/Blueberry-API/src/main/java/net/blueberrymc/world/item/SimpleBlueberryItem.java b/Blueberry-API/src/main/java/net/blueberrymc/world/item/SimpleBlueberryItem.java
@@ -4,19 +4,18 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
 
 public class SimpleBlueberryItem extends BlueberryItem {
     private final Function<ItemStack, Component> toNameFunction;
 
-    public SimpleBlueberryItem(@NotNull("mod") BlueberryMod mod, @NotNull Properties properties, @NotNull("toNameFunction") Function<ItemStack, Component> toNameFunction) {
+    public SimpleBlueberryItem(@NotNull BlueberryMod mod, @NotNull Properties properties, @NotNull Function<@NotNull ItemStack, @NotNull Component> toNameFunction) {
         super(mod, properties);
         this.toNameFunction = toNameFunction;
     }
 
-    @Nullable
+    @NotNull
     @Override
     public Component getName(@NotNull ItemStack itemStack) {
         return toNameFunction.apply(itemStack);