From 08a4f5f314268dc9289e205bcb10e64ede8212d7 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 21 Dec 2016 11:14:52 -0800 Subject: [PATCH] Add nullable annotations to IGuiHandler (#3550) --- .../minecraftforge/fml/common/network/IGuiHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java b/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java index 23643f3c4a..1294be7c08 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/IGuiHandler.java @@ -22,6 +22,8 @@ package net.minecraftforge.fml.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import javax.annotation.Nullable; + public interface IGuiHandler { /** @@ -35,7 +37,9 @@ public interface IGuiHandler * @param z Z Position * @return A GuiScreen/Container to be displayed to the user, null if none. */ - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); + @Nullable + Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); + /** * Returns a Container to be displayed to the user. On the client side, this * needs to return a instance of GuiScreen On the server side, this needs to @@ -49,5 +53,6 @@ public interface IGuiHandler * @param z Z Position * @return A GuiScreen/Container to be displayed to the user, null if none. */ - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); + @Nullable + Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); }