Move nonnull annotations to package-info.java

eutro · eutro · commit 485db1667f4c · 2020-07-22T17:27:28.000+01:00
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerAdvancedTable.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerAdvancedTable.java
@@ -5,7 +5,6 @@
 import com.blakebr0.extendedcrafting.crafting.table.TableRecipeManager;
 import com.blakebr0.extendedcrafting.crafting.table.TableResultHandler;
 import com.blakebr0.extendedcrafting.tile.TileAdvancedCraftingTable;
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -14,10 +13,6 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerAdvancedTable extends Container {
 
 	public final InventoryCrafting matrix;
@@ -98,4 +93,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
 
 		return itemstack;
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerBasicTable.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerBasicTable.java
@@ -5,8 +5,6 @@
 import com.blakebr0.extendedcrafting.crafting.table.TableRecipeManager;
 import com.blakebr0.extendedcrafting.crafting.table.TableResultHandler;
 import com.blakebr0.extendedcrafting.tile.TileBasicCraftingTable;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -15,10 +13,6 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerBasicTable extends Container {
 
 	public final InventoryCrafting matrix;
@@ -99,4 +93,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
 
 		return itemstack;
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerCompressor.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerCompressor.java
@@ -4,18 +4,12 @@
 import com.blakebr0.cucumber.inventory.slot.SlotSingle;
 import com.blakebr0.extendedcrafting.crafting.CombinationRecipe;
 import com.blakebr0.extendedcrafting.tile.TileCompressor;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
 public class ContainerCompressor extends Container {
 
 	public CombinationRecipe recipe;
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerCraftingCore.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerCraftingCore.java
@@ -1,18 +1,12 @@
 package com.blakebr0.extendedcrafting.client.container;
 
 import com.blakebr0.extendedcrafting.tile.TileCraftingCore;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
 public class ContainerCraftingCore extends Container {
 
 	private final TileCraftingCore tile;
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerEliteTable.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerEliteTable.java
@@ -5,8 +5,6 @@
 import com.blakebr0.extendedcrafting.crafting.table.TableRecipeManager;
 import com.blakebr0.extendedcrafting.crafting.table.TableResultHandler;
 import com.blakebr0.extendedcrafting.tile.TileEliteCraftingTable;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -15,10 +13,6 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerEliteTable extends Container {
 
 	public final InventoryCrafting matrix;
@@ -99,4 +93,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
 
 		return itemstack;
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerEnderCrafter.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerEnderCrafter.java
@@ -3,19 +3,13 @@
 import com.blakebr0.extendedcrafting.crafting.endercrafter.EnderResultSlot;
 import com.blakebr0.extendedcrafting.crafting.table.TableCraftResult;
 import com.blakebr0.extendedcrafting.tile.TileEnderCrafter;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerEnderCrafter extends Container {
 
 	public final IInventory result;
@@ -88,4 +82,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
 
 		return itemstack;
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerHandheldTable.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerHandheldTable.java
@@ -1,21 +1,11 @@
 package com.blakebr0.extendedcrafting.client.container;
 
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCraftResult;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.inventory.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerHandheldTable extends Container {
 
 	public final InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
@@ -117,4 +107,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int index) {
 	public boolean canMergeSlot(ItemStack stack, Slot slot) {
 		return slot.inventory != this.craftResult && super.canMergeSlot(stack, slot);
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerUltimateTable.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/ContainerUltimateTable.java
@@ -5,8 +5,6 @@
 import com.blakebr0.extendedcrafting.crafting.table.TableRecipeManager;
 import com.blakebr0.extendedcrafting.crafting.table.TableResultHandler;
 import com.blakebr0.extendedcrafting.tile.TileUltimateCraftingTable;
-
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -15,10 +13,6 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ContainerUltimateTable extends Container {
 
 	public final InventoryCrafting matrix;
@@ -99,4 +93,4 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
 
 		return itemstack;
 	}
-}
+}
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/ContainerAutomationInterface.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/ContainerAutomationInterface.java
@@ -1,7 +1,6 @@
 package com.blakebr0.extendedcrafting.client.container.automationinterface;
 
 import com.blakebr0.extendedcrafting.tile.TileAutomationInterface;
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -10,10 +9,7 @@
 import net.minecraftforge.items.SlotItemHandler;
 
 import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
 
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
 public class ContainerAutomationInterface extends Container {
 
 	public final TileAutomationInterface tile;
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/ContainerViewRecipe.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/ContainerViewRecipe.java
@@ -2,17 +2,12 @@
 
 import com.blakebr0.extendedcrafting.lib.ViewRecipeInfo;
 import com.blakebr0.extendedcrafting.tile.TileAutomationInterface;
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
 public class ContainerViewRecipe extends Container {
 
 	public final TileAutomationInterface tile;
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/package-info.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/automationinterface/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.blakebr0.extendedcrafting.client.container.automationinterface;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/blakebr0/extendedcrafting/client/container/package-info.java b/src/main/java/com/blakebr0/extendedcrafting/client/container/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.blakebr0.extendedcrafting.client.container;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
