Mappings bump, nullable/nonnull annotations

SlimeKnights · May 31, 2016 · 141ce60 · 141ce60
1 parent 744f2ab
commit 141ce60
Show file tree

Hide file tree

Showing 29 changed files with 152 additions and 48 deletions.
diff --git a/build.properties b/build.properties
@@ -1,7 +1,7 @@
 mod_version=0.10.1
 minecraft_version=1.9.4
-forge_version=12.17.0.1921-1.9.4
-mappings=snapshot_20160525
+forge_version=12.17.0.1937
+mappings=snapshot_20160531
 
 jei_version=3.4.+
 configurate_version=2.0
diff --git a/src/main/java/slimeknights/mantle/block/BlockInventory.java b/src/main/java/slimeknights/mantle/block/BlockInventory.java
@@ -15,6 +15,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+
 import slimeknights.mantle.tileentity.TileInventory;
 
 // Updated Version of InventoryBlock in Mantle
@@ -30,8 +32,9 @@ public boolean hasTileEntity(IBlockState state) {
     return true;
   }
 
+  @Nonnull
   @Override
-  public abstract TileEntity createNewTileEntity(World worldIn, int meta);
+  public abstract TileEntity createNewTileEntity(@Nonnull World worldIn, int meta);
 
   /**
    * Called when the block is activated. Return true if a GUI is opened, false if the block has no GUI.
@@ -68,7 +71,7 @@ public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, Enti
   }
 
   @Override
-  public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
+  public void breakBlock(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
     TileEntity tileentity = worldIn.getTileEntity(pos);
 
     if(tileentity instanceof TileInventory) {
@@ -86,6 +89,7 @@ public int damageDropped(IBlockState state) {
 
   // BlockContainer sets this to invisible
   // we need model for standard forge rendering
+  @Nonnull
   @Override
   public EnumBlockRenderType getRenderType(IBlockState state) {
     return EnumBlockRenderType.MODEL;

diff --git a/src/main/java/slimeknights/mantle/block/EnumBlock.java b/src/main/java/slimeknights/mantle/block/EnumBlock.java
@@ -14,6 +14,8 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 public class EnumBlock<E extends Enum<E> & EnumBlock.IEnumMeta & IStringSerializable> extends Block {
 
   public final PropertyEnum<E> prop;
@@ -35,12 +37,13 @@ private static Material preInit(Material material, PropertyEnum<?> property) {
 
   @SideOnly(Side.CLIENT)
   @Override
-  public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
+  public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List<ItemStack> list) {
     for(E type : values) {
       list.add(new ItemStack(this, 1, type.getMeta()));
     }
   }
 
+  @Nonnull
   @Override
   protected BlockStateContainer createBlockState() {
     if(prop == null) {
@@ -49,6 +52,7 @@ protected BlockStateContainer createBlockState() {
     return new BlockStateContainer(this, prop);
   }
 
+  @Nonnull
   @Override
   public IBlockState getStateFromMeta(int meta) {
     return this.getDefaultState().withProperty(prop, fromMeta(meta));

diff --git a/src/main/java/slimeknights/mantle/block/EnumBlockSlab.java b/src/main/java/slimeknights/mantle/block/EnumBlockSlab.java
@@ -15,6 +15,8 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 public abstract class EnumBlockSlab<E extends Enum<E> & EnumBlock.IEnumMeta & IStringSerializable> extends BlockSlab {
 
   public final PropertyEnum<E> prop;
@@ -37,12 +39,13 @@ private static Material preInit(Material material, PropertyEnum<?> property) {
 
   @SideOnly(Side.CLIENT)
   @Override
-  public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
+  public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List<ItemStack> list) {
     for(E type : values) {
       list.add(new ItemStack(this, 1, type.getMeta()));
     }
   }
 
+  @Nonnull
   @Override
   protected BlockStateContainer createBlockState() {
     if(prop == null) {
@@ -55,6 +58,7 @@ protected BlockStateContainer createBlockState() {
   /**
    * Convert the given metadata into a BlockState for this Block
    */
+  @Nonnull
   @Override
   public IBlockState getStateFromMeta(int meta) {
     return this.getDefaultState()
@@ -90,16 +94,19 @@ protected E fromMeta(int meta) {
     return values[meta];
   }
 
+  @Nonnull
   @Override
   public IProperty<?> getVariantProperty() {
     return prop;
   }
 
+  @Nonnull
   @Override
-  public Comparable<?> getTypeForItem(ItemStack stack) {
+  public Comparable<?> getTypeForItem(@Nonnull ItemStack stack) {
     return fromMeta(stack.getItemDamage() & 7);
   }
 
+  @Nonnull
   @Override
   public String getUnlocalizedName(int meta) {
     return super.getUnlocalizedName() + "." + fromMeta(meta & 7).getName();

diff --git a/src/main/java/slimeknights/mantle/client/CreativeTab.java b/src/main/java/slimeknights/mantle/client/CreativeTab.java
@@ -6,6 +6,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import javax.annotation.Nonnull;
+
 public class CreativeTab extends CreativeTabs {
 
   private ItemStack icon;
@@ -23,6 +25,7 @@ public void setDisplayIcon(ItemStack displayIcon) {
     }
   }
 
+  @Nonnull
   @SideOnly(Side.CLIENT)
   @Override
   public ItemStack getIconItemStack() {
@@ -35,6 +38,7 @@ public int getIconItemDamage() {
     return icon.getItemDamage();
   }
 
+  @Nonnull
   @SideOnly(Side.CLIENT)
   @Override
   public Item getTabIconItem() {

diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java
@@ -16,6 +16,8 @@
 
 import java.util.HashMap;
 
+import javax.annotation.Nonnull;
+
 import slimeknights.mantle.Mantle;
 import slimeknights.mantle.client.book.action.StringActionProcessor;
 import slimeknights.mantle.client.book.action.protocol.ProtocolGoToPage;
@@ -165,7 +167,7 @@ public static void updateSavedPage(EntityPlayer player, ItemStack item, String p
    * Reloads all the books, called when the resource manager reloads, such as when the resource pack or the language is changed
    */
   @Override
-  public void onResourceManagerReload(IResourceManager resourceManager) {
+  public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) {
     Mantle.logger.info("Started loading books...");
     long time = System.nanoTime();
 

diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import slimeknights.mantle.Mantle;
 import slimeknights.mantle.inventory.ContainerMultiModule;
 import slimeknights.mantle.inventory.SlotWrapper;
@@ -148,7 +150,7 @@ public void setWorldAndResolution(Minecraft mc, int width, int height) {
   }
 
   @Override
-  public void onResize(Minecraft mc, int width, int height) {
+  public void onResize(@Nonnull Minecraft mc, int width, int height) {
     super.onResize(mc, width, height);
 
     for(GuiModule module : modules) {

diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java
@@ -7,6 +7,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import javax.annotation.Nonnull;
+
 import static slimeknights.mantle.client.gui.book.Textures.TEX_BOOK;
 
 @SideOnly(Side.CLIENT)
@@ -31,7 +33,7 @@ public GuiArrow(int buttonId, int x, int y, ArrowType arrowType, int color, int
   }
 
   @Override
-  public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+  public void drawButton(@Nonnull Minecraft mc, int mouseX, int mouseY) {
     if(this.visible) {
       mc.getTextureManager().bindTexture(TEX_BOOK);
 

diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java
@@ -6,6 +6,8 @@
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 
+import javax.annotation.Nonnull;
+
 import slimeknights.mantle.client.book.data.BookmarkData;
 
 public class GuiBookmark extends GuiButton {
@@ -30,7 +32,7 @@ public GuiBookmark(BookmarkData data) {
   }
 
   @Override
-  public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+  public void drawButton(@Nonnull Minecraft mc, int mouseX, int mouseY) {
     if(visible) {
       int tex_y = TEX_Y + HEIGHT * type;
 

diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java
@@ -30,6 +30,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import slimeknights.mantle.client.book.data.element.BlockData;
 import slimeknights.mantle.client.book.data.element.ItemStackData;
 
@@ -261,20 +263,21 @@ public BlockAccess(int[] size, BlockData[] structure) {
     }
 
     @Override
-    public TileEntity getTileEntity(BlockPos pos) {
+    public TileEntity getTileEntity(@Nonnull BlockPos pos) {
       if(!isValid(pos)) {
         return null;
       }
       return tileEntityMap.get(new Integer[]{pos.getX(), pos.getY(), pos.getZ()});
     }
 
     @Override
-    public int getCombinedLight(BlockPos pos, int lightValue) {
+    public int getCombinedLight(@Nonnull BlockPos pos, int lightValue) {
       return 15;
     }
 
+    @Nonnull
     @Override
-    public IBlockState getBlockState(BlockPos pos) {
+    public IBlockState getBlockState(@Nonnull BlockPos pos) {
       if(!isValid(pos)) {
         return Blocks.AIR.getDefaultState();
       }
@@ -287,12 +290,13 @@ public IBlockState getBlockState(BlockPos pos) {
     }
 
     @Override
-    public boolean isAirBlock(BlockPos pos) {
+    public boolean isAirBlock(@Nonnull BlockPos pos) {
       return !isValid(pos) || Block.getBlockById(blocks[pos.getX()][pos.getY()][pos.getZ()]) == Blocks.AIR;
     }
 
+    @Nonnull
     @Override
-    public Biome getBiome(BlockPos blockPos) {
+    public Biome getBiome(@Nonnull BlockPos blockPos) {
       return Biomes.JUNGLE;
     }
 
@@ -302,7 +306,7 @@ public boolean extendedLevelsInChunkCache() {
     }
 
     @Override
-    public int getStrongPower(BlockPos pos, EnumFacing direction) {
+    public int getStrongPower(@Nonnull BlockPos pos, @Nonnull EnumFacing direction) {
       if(!isValid(pos)) {
         return 0;
       }
@@ -311,13 +315,14 @@ public int getStrongPower(BlockPos pos, EnumFacing direction) {
       return iblockstate.getBlock().getStrongPower(iblockstate, this, pos, direction);
     }
 
+    @Nonnull
     @Override
     public WorldType getWorldType() {
       return WorldType.DEFAULT;
     }
 
     @Override
-    public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) {
+    public boolean isSideSolid(@Nonnull BlockPos pos, @Nonnull EnumFacing side, boolean _default) {
       if(!this.isValid(pos)) {
         return _default;
       }

diff --git a/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java b/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java
@@ -11,6 +11,8 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 /**
  * Groups multiple baked models into a single one. Does not respect state etc. when getting quads.
  * Best use the Builder to create a BakedCompositeModel.
@@ -25,6 +27,7 @@ public BakedCompositeModel(IBakedModel parent, ImmutableMap<Optional<EnumFacing>
     this.parts = parts;
   }
 
+  @Nonnull
   @Override
   public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
     return parts.get(Optional.fromNullable(side));

diff --git a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
 
 public class BakedSimple implements IPerspectiveAwareModel {
@@ -59,6 +60,7 @@ public BakedSimple(List<BakedQuad> quads, ImmutableMap<ItemCameraTransforms.Tran
     this.overrides = overrides;
   }
 
+  @Nonnull
   @Override
   public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
     return quads;
@@ -79,16 +81,19 @@ public boolean isBuiltInRenderer() {
     return false;
   }
 
+  @Nonnull
   @Override
   public TextureAtlasSprite getParticleTexture() {
     return particle;
   }
 
+  @Nonnull
   @Override
   public ItemCameraTransforms getItemCameraTransforms() {
     return ItemCameraTransforms.DEFAULT;
   }
 
+  @Nonnull
   @Override
   public ItemOverrideList getOverrides() {
     return overrides;

diff --git a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java
@@ -16,6 +16,7 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
 
 public class BakedWrapper implements IBakedModel {
@@ -26,6 +27,7 @@ public BakedWrapper(IBakedModel parent) {
     this.parent = parent;
   }
 
+  @Nonnull
   @Override
   public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
     return parent.getQuads(state, side, rand);
@@ -46,16 +48,19 @@ public boolean isBuiltInRenderer() {
     return parent.isBuiltInRenderer();
   }
 
+  @Nonnull
   @Override
   public TextureAtlasSprite getParticleTexture() {
     return parent.getParticleTexture();
   }
 
+  @Nonnull
   @Override
   public ItemCameraTransforms getItemCameraTransforms() {
     return parent.getItemCameraTransforms();
   }
 
+  @Nonnull
   @Override
   public ItemOverrideList getOverrides() {
     return parent.getOverrides();