mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-28 12:27:39 +00:00
Code Issues Releases Wiki Activity

Add @Nullable and @NonNull annotations

Browse Source
This commit is contained in:
SquidDev
2017-05-07 00:07:42 +01:00
parent 9d1872c948
commit dc5517303f
128 changed files with 818 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dan200/computercraft/shared/turtle/upgrades/CraftingTablePeripheral.java
View File

@@ -13,6 +13,8 @@ import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.api.turtle.ITurtleAccess;
import dan200.computercraft.shared.turtle.core.TurtleCraftCommand;
import javax.annotation.Nonnull;
public class CraftingTablePeripheral
implements IPeripheral
{
@@ -25,12 +27,14 @@ public class CraftingTablePeripheral
// IPeripheral implementation
@Nonnull
@Override
public String getType()
{
return "workbench";
}
@Nonnull
@Override
public String[] getMethodNames()
{
@@ -59,7 +63,7 @@ public class CraftingTablePeripheral
}
@Override
public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws LuaException, InterruptedException
public Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException
{
switch( method )
{
@@ -77,12 +81,12 @@ public class CraftingTablePeripheral
}
@Override
public void attach( IComputerAccess computer )
public void attach( @Nonnull IComputerAccess computer )
{
}
@Override
public void detach( IComputerAccess computer )
public void detach( @Nonnull IComputerAccess computer )
{
}

14
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java
View File

@@ -20,6 +20,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import javax.vecmath.Matrix4f;
public class TurtleCraftingTable implements ITurtleUpgrade
@@ -41,6 +42,7 @@ public class TurtleCraftingTable implements ITurtleUpgrade
m_item = new ItemStack( Blocks.CRAFTING_TABLE, 1, 0 );
}
@Nonnull
@Override
public ResourceLocation getUpgradeID()
{
@@ -53,12 +55,14 @@ public class TurtleCraftingTable implements ITurtleUpgrade
return m_legacyID;
}
@Nonnull
@Override
public String getUnlocalisedAdjective()
{
return "upgrade.minecraft:crafting_table.adjective";
}
@Nonnull
@Override
public TurtleUpgradeType getType()
{
@@ -72,13 +76,14 @@ public class TurtleCraftingTable implements ITurtleUpgrade
}
@Override
public IPeripheral createPeripheral( ITurtleAccess turtle, TurtleSide side )
public IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
return new CraftingTablePeripheral( turtle );
}
@Nonnull
@Override
public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, EnumFacing dir )
public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing dir )
{
return null;
}
@@ -93,9 +98,10 @@ public class TurtleCraftingTable implements ITurtleUpgrade
}
}
@Nonnull
@Override
@SideOnly( Side.CLIENT )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, TurtleSide side )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{
loadModelLocations();
@@ -113,7 +119,7 @@ public class TurtleCraftingTable implements ITurtleUpgrade
}
@Override
public void update( ITurtleAccess turtle, TurtleSide side )
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
}
}

5
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java
View File

@@ -21,6 +21,8 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import javax.annotation.Nonnull;
public class TurtleHoe extends TurtleTool
{
public TurtleHoe( ResourceLocation id, int legacyId, String adjective, Item item )
@@ -45,8 +47,9 @@ public class TurtleHoe extends TurtleTool
return false;
}
@Nonnull
@Override
public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, EnumFacing direction )
public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction )
{
if( verb == TurtleVerb.Dig )
{

3
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java
View File

@@ -18,6 +18,7 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import javax.annotation.Nonnull;
import java.util.ArrayList;
public class TurtleInventoryCrafting extends InventoryCrafting
@@ -201,6 +202,7 @@ public class TurtleInventoryCrafting extends InventoryCrafting
return m_turtle.getInventory().getStackInSlot( i );
}
@Nonnull
@Override
public String getName()
{
@@ -213,6 +215,7 @@ public class TurtleInventoryCrafting extends InventoryCrafting
return false;
}
@Nonnull
@Override
public ITextComponent getDisplayName()
{

14
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java
View File

@@ -26,6 +26,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import javax.vecmath.Matrix4f;
public class TurtleModem implements ITurtleUpgrade
@@ -93,6 +94,7 @@ public class TurtleModem implements ITurtleUpgrade
m_legacyID = legacyId;
}
@Nonnull
@Override
public ResourceLocation getUpgradeID()
{
@@ -105,6 +107,7 @@ public class TurtleModem implements ITurtleUpgrade
return m_legacyID;
}
@Nonnull
@Override
public String getUnlocalisedAdjective()
{
@@ -118,6 +121,7 @@ public class TurtleModem implements ITurtleUpgrade
}
}
@Nonnull
@Override
public TurtleUpgradeType getType()
{
@@ -138,13 +142,14 @@ public class TurtleModem implements ITurtleUpgrade
}
@Override
public IPeripheral createPeripheral( ITurtleAccess turtle, TurtleSide side )
public IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
return new Peripheral( turtle, m_advanced );
}
@Nonnull
@Override
public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, EnumFacing dir )
public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing dir )
{
return null;
}
@@ -171,9 +176,10 @@ public class TurtleModem implements ITurtleUpgrade
}
}
@Nonnull
@Override
@SideOnly( Side.CLIENT )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, TurtleSide side )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{
loadModelLocations();
@@ -207,7 +213,7 @@ public class TurtleModem implements ITurtleUpgrade
}
@Override
public void update( ITurtleAccess turtle, TurtleSide side )
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
// Advance the modem
if( !turtle.getWorld().isRemote )

14
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
View File

@@ -35,6 +35,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import javax.vecmath.Matrix4f;
import java.util.Iterator;
@@ -53,6 +54,7 @@ public class TurtleTool implements ITurtleUpgrade
m_item = new ItemStack( item, 1, 0 );
}
@Nonnull
@Override
public ResourceLocation getUpgradeID()
{
@@ -65,12 +67,14 @@ public class TurtleTool implements ITurtleUpgrade
return m_legacyId;
}
@Nonnull
@Override
public String getUnlocalisedAdjective()
{
return m_adjective;
}
@Nonnull
@Override
public TurtleUpgradeType getType()
{
@@ -84,14 +88,15 @@ public class TurtleTool implements ITurtleUpgrade
}
@Override
public IPeripheral createPeripheral( ITurtleAccess turtle, TurtleSide side )
public IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
return null;
}
@Nonnull
@Override
@SideOnly( Side.CLIENT )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, TurtleSide side )
public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{
float xOffset = (side == TurtleSide.Left) ? -0.40625f : 0.40625f;
Matrix4f transform = new Matrix4f(
@@ -108,12 +113,13 @@ public class TurtleTool implements ITurtleUpgrade
}
@Override
public void update( ITurtleAccess turtle, TurtleSide side )
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{
}
@Nonnull
@Override
public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, EnumFacing direction )
public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction )
{
switch( verb )
{