Add a second constructor to PosGuiData that takes a BlockPos (CleanroomMC#178)

* Add second constructor to PosGuiData that takes a BlockPos

* Add nullability annotations to GuiData parameters and getter methods

(cherry picked from commit db36219)

Author: Zorbatron

src/main/java/com/cleanroommc/modularui/factory/GuiData.java

@@ -6,6 +6,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Objects;
 
 /**
@@ -20,10 +22,11 @@ public class GuiData {
 
     private final EntityPlayer player;
 
-    public GuiData(EntityPlayer player) {
+    public GuiData(@NotNull EntityPlayer player) {
         this.player = Objects.requireNonNull(player);
     }
 
+    @NotNull
     public EntityPlayer getPlayer() {
         return this.player;
     }

src/main/java/com/cleanroommc/modularui/factory/PlayerInventoryGuiData.java

@@ -5,17 +5,20 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 public class PlayerInventoryGuiData extends GuiData {
 
     private final InventoryType inventoryType;
     private final int slotIndex;
 
-    public PlayerInventoryGuiData(EntityPlayer player, InventoryType inventoryType, int slotIndex) {
+    public PlayerInventoryGuiData(@NotNull EntityPlayer player, @NotNull InventoryType inventoryType, int slotIndex) {
         super(player);
         this.inventoryType = inventoryType;
         this.slotIndex = slotIndex;
     }
 
+    @NotNull
     public InventoryType getInventoryType() {
         return inventoryType;
     }

src/main/java/com/cleanroommc/modularui/factory/PosGuiData.java

@@ -5,20 +5,32 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
 /**
  * See {@link GuiData} for an explanation for what this is for.
  */
 public class PosGuiData extends GuiData {
 
     private final int x, y, z;
 
-    public PosGuiData(EntityPlayer player, int x, int y, int z) {
+    public PosGuiData(@NotNull EntityPlayer player, int x, int y, int z) {
         super(player);
         this.x = x;
         this.y = y;
         this.z = z;
     }
 
+    public PosGuiData(@NotNull EntityPlayer player, @NotNull BlockPos pos) {
+        super(player);
+        Objects.requireNonNull(pos);
+        this.x = pos.getX();
+        this.y = pos.getY();
+        this.z = pos.getZ();
+    }
+
     public int getX() {
         return this.x;
     }

src/main/java/com/cleanroommc/modularui/factory/SidedPosGuiData.java

@@ -3,18 +3,23 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
 /**
  * See {@link GuiData} for an explanation for what this is for.
  */
 public class SidedPosGuiData extends PosGuiData {
 
     private final ForgeDirection side;
 
-    public SidedPosGuiData(EntityPlayer player, int x, int y, int z, ForgeDirection side) {
+    public SidedPosGuiData(@NotNull EntityPlayer player, int x, int y, int z, @NotNull ForgeDirection side) {
         super(player, x, y, z);
-        this.side = side;
+        this.side = Objects.requireNonNull(side);
     }
 
+    @NotNull
     public ForgeDirection getSide() {
         return this.side;
     }